From ca106e9bcd97511e75a935f07d085982b7267be1 Mon Sep 17 00:00:00 2001
From: Anton Kirilov <anton.kirilov@arm.com>
Date: Wed, 18 May 2022 15:51:32 +0100
Subject: [PATCH] Update the WebAssembly spec testsuite (#4160)

Copyright (c) 2022, Arm Limited.
---
 build.rs             | 3 +--
 tests/spec_testsuite | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.rs b/build.rs
index 9e1017ee1f6d..141469d48711 100644
--- a/build.rs
+++ b/build.rs
@@ -36,7 +36,6 @@ fn main() -> anyhow::Result<()> {
             // Skip running spec_testsuite tests if the submodule isn't checked
             // out.
             if spec_tests > 0 {
-                test_directory_module(out, "tests/spec_testsuite/proposals/simd", strategy)?;
                 test_directory_module(out, "tests/spec_testsuite/proposals/memory64", strategy)?;
             } else {
                 println!(
@@ -171,7 +170,7 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
         "Cranelift" => match (testsuite, testname) {
             // No simd support yet for s390x.
             ("simd", _) if platform_is_s390x() => return true,
-            ("memory64", "simd") if platform_is_s390x() => return true,
+            _ if platform_is_s390x() && testname.starts_with("simd") => return true,
             _ => {}
         },
         _ => panic!("unrecognized strategy"),
diff --git a/tests/spec_testsuite b/tests/spec_testsuite
index 4fd2339b5e97..e25ae159357c 160000
--- a/tests/spec_testsuite
+++ b/tests/spec_testsuite
@@ -1 +1 @@
-Subproject commit 4fd2339b5e9709e74b326797f69a88b13eac4d47
+Subproject commit e25ae159357c055b3a6fac99043644e208d26d2a