Merge pull request #3587 from JohnTitor/fix-macos

Fix CI
rust-lang · Feb 17, 2024 · f5c4427 · f5c4427
2 parents 7d19eed + ba128d7
commit f5c4427
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/full_ci.yml b/.github/workflows/full_ci.yml
@@ -62,10 +62,11 @@ jobs:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
-          - target: i686-pc-windows-gnu
-            env:
-              ARCH_BITS: 32
-              ARCH: i686
+          # FIXME: It currently causes segfaults.
+          #- target: i686-pc-windows-gnu
+          #  env:
+          #    ARCH_BITS: 32
+          #    ARCH: i686
           - target: i686-pc-windows-msvc
     steps:
       - uses: actions/checkout@v4

diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -296,6 +296,8 @@ fn test_apple(target: &str) {
             // it is a moving target, changing through versions
             // also contains bitfields members
             "tcp_connection_info" => true,
+            // FIXME: The size is changed in recent macOSes.
+            "malloc_introspection_t" => true,
 
             _ => false,
         }
@@ -2427,6 +2429,9 @@ fn test_freebsd(target: &str) {
                 true
             }
 
+            // FIXME: Removed in FreeBSD 15:
+            "LOCAL_CONNWAIT" => true,
+
             _ => false,
         }
     });