Fixes for compiling on macOS

Signed-off-by: Jem McElwain <jmcelwain@gmail.com>

Author: Jem McElwain

Makefile

@@ -101,7 +101,11 @@ shellcheck:
 
 .PHONY: test
 test: fetch
+ifeq ($(findstring darwin,$(CARGO_TARGET)),darwin)
+	$(CARGO_TEST) --workspace --exclude linkerd-system
+else
 	$(CARGO_TEST)
+endif
 
 .PHONY: package
 package: $(PKG_ROOT)/$(PKG)

linkerd/app/integration/src/tests/telemetry.rs

@@ -1199,10 +1199,7 @@ mod transport {
     async fn inbound_tcp_connect_err() {
         let _trace = trace_init();
         let srv = tcp::server()
-            .accept_fut(move |sock| {
-                drop(sock);
-                future::ok(())
-            })
+            .accept_fut(move |sock| async { drop(sock) })
             .run()
             .await;
         let proxy = proxy::new().inbound(srv).run().await;
@@ -1213,7 +1210,7 @@ mod transport {
         let tcp_client = client.connect().await;
 
         tcp_client.write(TcpFixture::HELLO_MSG).await;
-        assert_eq!(tcp_client.read().await, &[]);
+        assert_eq!(tcp_client.read().await, &[] as &[u8]);
         // Connection to the server should be a failure with the EXFULL error
         metrics::metric("tcp_close_total")
             .label("peer", "dst")
@@ -1233,15 +1230,12 @@ mod transport {
             .await;
     }
 
-    #[test]
+    #[tokio::test]
     #[cfg(target_os = "macos")]
-    fn outbound_tcp_connect_err() {
+    async fn outbound_tcp_connect_err() {
         let _trace = trace_init();
         let srv = tcp::server()
-            .accept_fut(move |sock| {
-                drop(sock);
-                future::ok(())
-            })
+            .accept_fut(move |sock| async { drop(sock) })
             .run()
             .await;
         let proxy = proxy::new().outbound(srv).run().await;
@@ -1252,7 +1246,7 @@ mod transport {
         let tcp_client = client.connect().await;
 
         tcp_client.write(TcpFixture::HELLO_MSG).await;
-        assert_eq!(tcp_client.read().await, &[]);
+        assert_eq!(tcp_client.read().await, &[] as &[u8]);
         // Connection to the server should be a failure with the EXFULL error
         metrics::metric("tcp_close_total")
             .label("peer", "dst")