allow passes tests with more than one pass

2 files changed, 4 insertions, 3 deletions

diff --git a/auto_update_tests.py b/auto_update_tests.py
index 6f86bc1fe..0a42d8357 100755
--- a/auto_update_tests.py
+++ b/auto_update_tests.py
@@ -67,7 +67,8 @@ for t in sorted(os.listdir(os.path.join('test', 'passes'))):
   if t.endswith('.wast'):
     print '..', t
     passname = os.path.basename(t).replace('.wast', '')
-    cmd = [os.path.join('bin', 'binaryen-shell'), ('--' + passname if passname != 'O' else '-O'), os.path.join('test', 'passes', t), '--print']
+    opts = ['-O'] if passname == 'O' else ['--' + p for p in passname.split('_')]
+    cmd = [os.path.join('bin', 'binaryen-shell')] + opts + [os.path.join('test', 'passes', t), '--print']
     print '    ', ' '.join(cmd)
     actual, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     open(os.path.join('test', 'passes', passname + '.txt'), 'w').write(actual)
diff --git a/check.py b/check.py
index c0733cb6c..722371f2a 100755
--- a/check.py
+++ b/check.py
@@ -276,8 +276,8 @@ for t in sorted(os.listdir(os.path.join('test', 'passes'))):
   if t.endswith('.wast'):
     print '..', t
     passname = os.path.basename(t).replace('.wast', '')
-    opt = '-O' if passname == 'O' else '--' + passname
-    cmd = [os.path.join('bin', 'binaryen-shell'), opt, os.path.join('test', 'passes', t), '--print']
+    opts = ['-O'] if passname == 'O' else ['--' + p for p in passname.split('_')]
+    cmd = [os.path.join('bin', 'binaryen-shell')] + opts + [os.path.join('test', 'passes', t), '--print']
     actual = run_command(cmd)
     fail_if_not_identical(actual, open(os.path.join('test', 'passes', passname + '.txt')).read())