Allow test/passes tests to have arbitrary names, with a side file that contains the passes (#2532)

We already supported this, but required that the filename be a number.
This lets the name be anything, and we check if *.passes exists for it.

5 files changed, 6 insertions, 4 deletions

diff --git a/auto_update_tests.py b/auto_update_tests.py
index c085cf4b9..dafc1e30b 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -100,8 +100,9 @@ def update_wasm_opt_tests():
         binary = t.endswith('.wasm')
         base = os.path.basename(t).replace('.wast', '').replace('.wasm', '')
         passname = base
-        if passname.isdigit():
-            passname = open(os.path.join(shared.options.binaryen_test, 'passes', passname + '.passes')).read().strip()
+        passes_file = os.path.join(shared.get_test_dir('passes'), passname + '.passes')
+        if os.path.exists(passes_file):
+            passname = open(passes_file).read().strip()
         opts = [('--' + p if not p.startswith('O') else '-' + p) for p in passname.split('_')]
         actual = ''
         for module, asserts in support.split_wast(t):
diff --git a/check.py b/check.py
index f0bb04f19..d1c676b41 100755
--- a/check.py
+++ b/check.py
@@ -96,8 +96,9 @@ def run_wasm_opt_tests():
         binary = '.wasm' in t
         base = os.path.basename(t).replace('.wast', '').replace('.wasm', '')
         passname = base
-        if passname.isdigit():
-            passname = open(os.path.join(shared.get_test_dir('passes'), passname + '.passes')).read().strip()
+        passes_file = os.path.join(shared.get_test_dir('passes'), passname + '.passes')
+        if os.path.exists(passes_file):
+            passname = open(passes_file).read().strip()
         opts = [('--' + p if not p.startswith('O') else '-' + p) for p in passname.split('_')]
         actual = ''
         for module, asserts in support.split_wast(t):
diff --git a/test/passes/1.passes b/test/passes/interesting-pass-mix.passes
index 86b9bf7e3..86b9bf7e3 100644
--- a/test/passes/1.passes
+++ b/test/passes/interesting-pass-mix.passes
diff --git a/test/passes/1.txt b/test/passes/interesting-pass-mix.txt
index 580787dff..580787dff 100644
--- a/test/passes/1.txt
+++ b/test/passes/interesting-pass-mix.txt
diff --git a/test/passes/1.wast b/test/passes/interesting-pass-mix.wast
index fba9e7c9e..fba9e7c9e 100644
--- a/test/passes/1.wast
+++ b/test/passes/interesting-pass-mix.wast