From b54cc81dad6704f1d5d6a1f40282eb340bf6cf6b Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 28 Sep 2022 07:38:09 -0700 Subject: [PATCH] Update spec test repo Our submodule was accidentally reverted to an older commit as part of #4271 and while it could be updated to as it was before I went ahead and updated it to `main`. --- crates/wast/src/wast.rs | 6 +++--- tests/spec_testsuite | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/wast/src/wast.rs b/crates/wast/src/wast.rs index 6980a0317d65..a8460ab2c508 100644 --- a/crates/wast/src/wast.rs +++ b/crates/wast/src/wast.rs @@ -476,9 +476,6 @@ impl WastContext { fn is_matching_assert_invalid_error_message(expected: &str, actual: &str) -> bool { actual.contains(expected) - // `elem.wast` and `proposals/bulk-memory-operations/elem.wast` disagree - // on the expected error message for the same error. - || (expected.contains("out of bounds") && actual.contains("does not fit")) // slight difference in error messages || (expected.contains("unknown elem segment") && actual.contains("unknown element segment")) // The same test here is asserted to have one error message in @@ -486,4 +483,7 @@ fn is_matching_assert_invalid_error_message(expected: &str, actual: &str) -> boo // `memory64/memory.wast`, so we equate these two error messages to get // the memory64 tests to pass. || (expected.contains("memory size must be at most 65536 pages") && actual.contains("invalid u32 number")) + // the spec test suite asserts a different error message than we print + // for this scenario + || (expected == "unknown global" && actual.contains("global.get of locally defined global")) } diff --git a/tests/spec_testsuite b/tests/spec_testsuite index 4fd2339b5e97..4f77306bb631 160000 --- a/tests/spec_testsuite +++ b/tests/spec_testsuite @@ -1 +1 @@ -Subproject commit 4fd2339b5e9709e74b326797f69a88b13eac4d47 +Subproject commit 4f77306bb63151631d84f58dedf67958eb9911b9