diff options
| author | Cheng Shao <terrorjack@type.dance> | 2023-02-01 12:30:32 +0000 |
|---|---|---|
| committer | Cheng Shao <terrorjack@type.dance> | 2023-03-30 18:43:53 +0000 |
| commit | f1beee369840b42183d17ab6175fd860f14f869d (patch) | |
| tree | 5d1a3cfff01817d54a4ed74958b62f216e0234f4 | |
| parent | 30c84511af8ad70705bbde98d0ba73cdbb1d8565 (diff) | |
| download | haskell-f1beee369840b42183d17ab6175fd860f14f869d.tar.gz | |
testsuite: normalize the .wasm extension
| -rw-r--r-- | testsuite/driver/testlib.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 237f881044..0a5f4a5933 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -2364,6 +2364,8 @@ def normalise_errmsg(s: str) -> str: # hacky solution is used in place of more sophisticated filename # mangling s = re.sub('([^\\s])\\.exe', '\\1', s) + # Same thing for .wasm modules generated by the Wasm backend + s = re.sub('([^\\s])\\.wasm', '\\1', s) # Same thing for .jsexe directories generated by the JS backend s = re.sub('([^\\s])\\.jsexe', '\\1', s) @@ -2485,6 +2487,7 @@ def normalise_slashes_( s: str ) -> str: def normalise_exe_( s: str ) -> str: s = re.sub(r'\.exe', '', s) + s = re.sub(r'\.wasm', '', s) s = re.sub(r'\.jsexe', '', s) return s @@ -2494,9 +2497,11 @@ def normalise_output( s: str ) -> str: s = modify_lines(s, lambda l: re.sub(' error:', '', l)) s = modify_lines(s, lambda l: re.sub(' Warning:', ' warning:', l)) # Remove a .exe extension (for Windows) + # and .wasm extension (for the Wasm backend) # and .jsexe extension (for the JS backend) # This can occur in error messages generated by the program. s = re.sub('([^\\s])\\.exe', '\\1', s) + s = re.sub('([^\\s])\\.wasm', '\\1', s) s = re.sub('([^\\s])\\.jsexe', '\\1', s) s = normalise_callstacks(s) s = normalise_type_reps(s) |