[test] Convert with_pass_debug to a python context manager. NFC (#8337)

Author: sbc100

check.py

@@ -77,12 +77,10 @@ def run_wasm_dis_tests():
         shared.fail_if_not_identical_to_file(actual, t + '.fromBinary')
 
         # also verify there are no validation errors
-        def check():
+        with shared.with_pass_debug():
             cmd = shared.WASM_OPT + [t, '-all', '-q']
             support.run_command(cmd)
 
-        shared.with_pass_debug(check)
-
 
 def run_crash_tests():
     print("\n[ checking we don't crash on tricky inputs... ]\n")
@@ -392,34 +390,30 @@ def run_unittest():
         raise Exception("unittest failed")
 
 
+@shared.with_pass_debug()
 def run_lit():
-    def run():
-        lit_script = os.path.join(shared.options.binaryen_bin, 'binaryen-lit')
-        lit_tests = os.path.join(shared.options.binaryen_root, 'test', 'lit')
-        # lit expects to be run as its own executable
-        cmd = [sys.executable, lit_script, lit_tests, '-vv']
-        result = subprocess.run(cmd)
-        if result.returncode != 0:
-            shared.num_failures += 1
-        if shared.options.abort_on_first_failure and shared.num_failures:
-            raise Exception("lit test failed")
-
-    shared.with_pass_debug(run)
+    lit_script = os.path.join(shared.options.binaryen_bin, 'binaryen-lit')
+    lit_tests = os.path.join(shared.options.binaryen_root, 'test', 'lit')
+    # lit expects to be run as its own executable
+    cmd = [sys.executable, lit_script, lit_tests, '-vv']
+    result = subprocess.run(cmd)
+    if result.returncode != 0:
+        shared.num_failures += 1
+    if shared.options.abort_on_first_failure and shared.num_failures:
+        raise Exception("lit test failed")
 
 
+@shared.with_pass_debug()
 def run_gtest():
-    def run():
-        gtest = os.path.join(shared.options.binaryen_bin, 'binaryen-unittests')
-        if not os.path.isfile(gtest):
-            shared.warn('gtest binary not found - skipping tests')
-        else:
-            result = subprocess.run(gtest)
-            if result.returncode != 0:
-                shared.num_failures += 1
-            if shared.options.abort_on_first_failure and shared.num_failures:
-                raise Exception("gtest test failed")
-
-    shared.with_pass_debug(run)
+    gtest = os.path.join(shared.options.binaryen_bin, 'binaryen-unittests')
+    if not os.path.isfile(gtest):
+        shared.warn('gtest binary not found - skipping tests')
+    else:
+        result = subprocess.run(gtest)
+        if result.returncode != 0:
+            shared.num_failures += 1
+        if shared.options.abort_on_first_failure and shared.num_failures:
+            raise Exception("gtest test failed")
 
 
 TEST_SUITES = OrderedDict([

scripts/test/shared.py

@@ -22,6 +22,7 @@
 import stat
 import subprocess
 import sys
+from contextlib import contextmanager
 from pathlib import Path
 
 # The C++ standard whose features are required to build Binaryen.
@@ -514,12 +515,12 @@ def binary_format_check(wast, verify_final_result=True, wasm_as_args=['-g'],
     return disassembled_file
 
 
-# run a check with BINARYEN_PASS_DEBUG set, to do full validation
-def with_pass_debug(check):
+@contextmanager
+def with_pass_debug():
     old_pass_debug = os.environ.get('BINARYEN_PASS_DEBUG')
+    os.environ['BINARYEN_PASS_DEBUG'] = '1'
     try:
-        os.environ['BINARYEN_PASS_DEBUG'] = '1'
-        check()
+        yield
     finally:
         if old_pass_debug is not None:
             os.environ['BINARYEN_PASS_DEBUG'] = old_pass_debug

scripts/test/wasm2js.py

@@ -104,7 +104,8 @@ def test_wasm2js_output():
                 cmd += ['--allow-asserts']
                 js = support.run_command(cmd)
                 # also verify it passes pass-debug verifications
-                shared.with_pass_debug(lambda: support.run_command(cmd, stderr=subprocess.PIPE))
+                with shared.with_pass_debug():
+                    support.run_command(cmd, stderr=subprocess.PIPE)
 
                 open('a.2asm.asserts.mjs', 'w').write(js)
 

scripts/test/wasm_opt.py

@@ -72,11 +72,10 @@ def test_wasm_opt():
             shared.fail_if_not_contained(actual, debugged)
 
             # also check pass-debug mode
-            def check():
+            with shared.with_pass_debug():
                 # ignore stderr, as the pass-debug output is very verbose in CI
                 pass_debug = support.run_command(cmd, stderr=subprocess.PIPE)
                 shared.fail_if_not_identical(curr, pass_debug)
-            shared.with_pass_debug(check)
 
         expected_file = os.path.join(shared.get_test_dir('passes'), base + ('.bin' if binary else '') + '.txt')
         shared.fail_if_not_identical_to_file(actual, expected_file)