diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-09-12 20:27:50 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-09-12 20:27:50 +0200 |
| commit | 4560603b1c37ba908f3934667db6c41ba323d04d (patch) | |
| tree | 509231597a7369128bd44b83895288dfe06edbda | |
| parent | d480d9ee3b8bf1b07f85fee1605df1a106c50530 (diff) | |
| download | rust-4560603b1c37ba908f3934667db6c41ba323d04d.tar.gz rust-4560603b1c37ba908f3934667db6c41ba323d04d.zip | |
Re-enable portable simd testing
| -rw-r--r-- | build_system/prepare.rs | 2 | ||||
| -rw-r--r-- | patches/0001-portable-simd-Disable-unsupported-tests.patch | 3 | ||||
| -rwxr-xr-x | scripts/tests.sh | 17 |
3 files changed, 11 insertions, 11 deletions
diff --git a/build_system/prepare.rs b/build_system/prepare.rs index 722843903bb..ae9a35048bd 100644 --- a/build_system/prepare.rs +++ b/build_system/prepare.rs @@ -30,7 +30,7 @@ pub(crate) fn prepare() { clone_repo( "portable-simd", "https://github.com/rust-lang/portable-simd", - "d42875302dd9e924f8d667b32e88989388989b79", + "8cf7a62e5d2552961df51e5200aaa5b7c890a4bf", ); apply_patches("portable-simd", Path::new("portable-simd")); diff --git a/patches/0001-portable-simd-Disable-unsupported-tests.patch b/patches/0001-portable-simd-Disable-unsupported-tests.patch index 6c527833693..2e683694663 100644 --- a/patches/0001-portable-simd-Disable-unsupported-tests.patch +++ b/patches/0001-portable-simd-Disable-unsupported-tests.patch @@ -71,11 +71,12 @@ diff --git a/crates/core_simd/tests/masks.rs b/crates/core_simd/tests/masks.rs index 61d8e44..2bccae2 100644 --- a/crates/core_simd/tests/masks.rs +++ b/crates/core_simd/tests/masks.rs -@@ -67,18 +67,6 @@ macro_rules! test_mask_api { +@@ -67,19 +67,6 @@ macro_rules! test_mask_api { assert_eq!(int.to_array(), [-1, 0, 0, -1, 0, 0, -1, 0]); assert_eq!(core_simd::Mask::<$type, 8>::from_int(int), mask); } - +- #[cfg(feature = "generic_const_exprs")] - #[test] - fn roundtrip_bitmask_conversion() { - let values = [ diff --git a/scripts/tests.sh b/scripts/tests.sh index a71a99641bb..28a7980d661 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -137,15 +137,14 @@ function extended_sysroot_tests() { fi popd - # FIXME(rust-lang/portable-simd#156) portable-simd doesn't compile with latest nightly - #pushd portable-simd - #echo "[TEST] rust-lang/portable-simd" - #../build/cargo clean - #../build/cargo build --all-targets --target $TARGET_TRIPLE - #if [[ "$HOST_TRIPLE" = "$TARGET_TRIPLE" ]]; then - # ../build/cargo test -q - #fi - #popd + pushd portable-simd + echo "[TEST] rust-lang/portable-simd" + ../build/cargo clean + ../build/cargo build --all-targets --target $TARGET_TRIPLE + if [[ "$HOST_TRIPLE" = "$TARGET_TRIPLE" ]]; then + ../build/cargo test -q + fi + popd } case "$1" in |