Skip to content

Commit 4560603

Browse files
committed
Re-enable portable simd testing
1 parent d480d9e commit 4560603

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

build_system/prepare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub(crate) fn prepare() {
3030
clone_repo(
3131
"portable-simd",
3232
"https://github.com/rust-lang/portable-simd",
33-
"d42875302dd9e924f8d667b32e88989388989b79",
33+
"8cf7a62e5d2552961df51e5200aaa5b7c890a4bf",
3434
);
3535
apply_patches("portable-simd", Path::new("portable-simd"));
3636

patches/0001-portable-simd-Disable-unsupported-tests.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,12 @@ diff --git a/crates/core_simd/tests/masks.rs b/crates/core_simd/tests/masks.rs
7171
index 61d8e44..2bccae2 100644
7272
--- a/crates/core_simd/tests/masks.rs
7373
+++ b/crates/core_simd/tests/masks.rs
74-
@@ -67,18 +67,6 @@ macro_rules! test_mask_api {
74+
@@ -67,19 +67,6 @@ macro_rules! test_mask_api {
7575
assert_eq!(int.to_array(), [-1, 0, 0, -1, 0, 0, -1, 0]);
7676
assert_eq!(core_simd::Mask::<$type, 8>::from_int(int), mask);
7777
}
7878
-
79+
- #[cfg(feature = "generic_const_exprs")]
7980
- #[test]
8081
- fn roundtrip_bitmask_conversion() {
8182
- let values = [

scripts/tests.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,14 @@ function extended_sysroot_tests() {
137137
fi
138138
popd
139139

140-
# FIXME(rust-lang/portable-simd#156) portable-simd doesn't compile with latest nightly
141-
#pushd portable-simd
142-
#echo "[TEST] rust-lang/portable-simd"
143-
#../build/cargo clean
144-
#../build/cargo build --all-targets --target $TARGET_TRIPLE
145-
#if [[ "$HOST_TRIPLE" = "$TARGET_TRIPLE" ]]; then
146-
# ../build/cargo test -q
147-
#fi
148-
#popd
140+
pushd portable-simd
141+
echo "[TEST] rust-lang/portable-simd"
142+
../build/cargo clean
143+
../build/cargo build --all-targets --target $TARGET_TRIPLE
144+
if [[ "$HOST_TRIPLE" = "$TARGET_TRIPLE" ]]; then
145+
../build/cargo test -q
146+
fi
147+
popd
149148
}
150149

151150
case "$1" in

0 commit comments

Comments
 (0)