Merge pull request #3589 from JohnTitor/fix-ci-libc-0.2

Fix CI on v0.2
rust-lang · Feb 18, 2024 · a55ce2f · a55ce2f
2 parents ccf8a3e + 8bc1512
commit a55ce2f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/full_ci.yml b/.github/workflows/full_ci.yml
@@ -63,10 +63,10 @@ jobs:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
-          - target: i686-pc-windows-gnu
-            env:
-              ARCH_BITS: 32
-              ARCH: i686
+          #- target: i686-pc-windows-gnu
+          #  env:
+          #    ARCH_BITS: 32
+          #    ARCH: i686
           - target: i686-pc-windows-msvc
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,10 +58,10 @@ jobs:
               ARCH_BITS: 64
               ARCH: x86_64
           - target: x86_64-pc-windows-msvc
-          - target: i686-pc-windows-gnu
-            env:
-              ARCH_BITS: 32
-              ARCH: i686
+          #- 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
@@ -312,6 +312,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,
         }
@@ -2468,6 +2470,9 @@ fn test_freebsd(target: &str) {
                 true
             }
 
+            // FIXME: Removed in FreeBSD 15:
+            "LOCAL_CONNWAIT" if freebsd_ver >= Some(15) => true,
+
             _ => false,
         }
     });