Make tests compile on stable

madsmtm · May 10, 2024 · c375275 · c375275
1 parent 6b35e34
commit c375275
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -496,7 +496,7 @@ jobs:
 
     - name: Test Foundation with unstable features
       if: ${{ matrix.nightly }}
-      run: cargo test $ARGS $PUBLIC_CRATES -ptests $INTERESTING_FEATURES -pobjc2-foundation --features=catch-all $UNSTABLE_FEATURES
+      run: cargo test $ARGS $PUBLIC_CRATES -ptests $INTERESTING_FEATURES -pobjc2-foundation --features=catch-all $UNSTABLE_FEATURES ${{ matrix.sdk != '10.12' && '--features=unstable-simd' || '' }}
 
     # TODO: Re-enable this on all of Foundation once we do some form of
     # availability checking.

diff --git a/crates/tests/Cargo.toml b/crates/tests/Cargo.toml
@@ -30,6 +30,8 @@ all = [
     "objc2-foundation/NSObjCRuntime",
 ]
 
+unstable-simd = []
+
 apple = ["block2/apple", "objc2/apple", "objc2-foundation/apple"]
 gnustep-1-7 = ["block2/gnustep-1-7", "objc2/gnustep-1-7", "objc2-foundation/gnustep-1-7"]
 gnustep-1-8 = ["gnustep-1-7", "block2/gnustep-1-8", "objc2/gnustep-1-8", "objc2-foundation/gnustep-1-8"]

diff --git a/crates/tests/build.rs b/crates/tests/build.rs
@@ -31,6 +31,7 @@ fn main() {
     builder.compiler("clang");
     builder.file("extern/encode_utils.m");
     builder.file("extern/test_object.m");
+    #[cfg(feature = "unstable-simd")]
     builder.file("extern/test_simd_return.m");
     println!("cargo:rerun-if-changed=extern/encode_utils.m");
     println!("cargo:rerun-if-changed=extern/test_object.m");

diff --git a/crates/tests/src/lib.rs b/crates/tests/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! This is used so that we don't need to add a `build.rs` script to `block2`.
 #![no_std]
-#![cfg_attr(feature = "apple", feature(repr_simd))]
+#![cfg_attr(all(feature = "apple", feature = "unstable-simd"), feature(repr_simd))]
 
 use std::os::raw::c_void;
 
@@ -23,7 +23,7 @@ mod test_foundation_retain_semantics;
 #[cfg(test)]
 mod test_object;
 #[cfg(test)]
-#[cfg(feature = "apple")]
+#[cfg(all(feature = "apple", feature = "unstable-simd"))]
 mod test_simd_return;
 
 #[no_mangle]