[test] Extract function in scripts/test/binaryenjs.py. NFC (#7535)

Also, move `js_test_wrap` into binaryenjs.py which is its only callsite.

Author: sbc100

scripts/test/binaryenjs.py

@@ -19,6 +19,31 @@
 from . import support
 
 
+def js_test_wrap():
+    # common wrapper code for JS tests, waiting for binaryen.js to become ready
+    # and providing common utility used by all tests:
+    return '''
+        (async function __in_test_code__() {
+            var binaryen = await Binaryen()
+            function assert(x) { if (!x) throw Error('Test assertion failed'); }
+            %TEST%
+        })();
+    '''
+
+
+def make_js_test(input_js_file, binaryen_js):
+    basename = os.path.basename(input_js_file)
+    outname = os.path.splitext(basename)[0] + '.mjs'
+    with open(outname, 'w') as f:
+        # avoid stdout/stderr ordering issues in some js shells - use just stdout
+        f.write('console.warn = console.error = console.log;')
+        binaryen_js = open(binaryen_js).read()
+        f.write(binaryen_js)
+        test_src = open(input_js_file).read()
+        f.write(js_test_wrap().replace('%TEST%', test_src))
+    return outname
+
+
 def do_test_binaryen_js_with(which):
     if not (shared.MOZJS or shared.NODEJS):
         shared.fail_with_error('no vm to run binaryen.js tests')
@@ -30,16 +55,7 @@ def do_test_binaryen_js_with(which):
     print('\n[ checking binaryen.js testcases (' + which + ')... ]\n')
 
     for s in shared.get_tests(shared.get_test_dir('binaryen.js'), ['.js']):
-        basename = os.path.basename(s)
-        outname = os.path.splitext(basename)[0] + '.mjs'
-        f = open(outname, 'w')
-        # avoid stdout/stderr ordering issues in some js shells - use just stdout
-        f.write('console.warn = console.error = console.log;')
-        binaryen_js = open(which).read()
-        f.write(binaryen_js)
-        test_src = open(s).read()
-        f.write(support.js_test_wrap().replace('%TEST%', test_src))
-        f.close()
+        outname = make_js_test(s, which)
 
         def test(cmd):
             if 'fatal' not in s:
@@ -55,10 +71,11 @@ def test(cmd):
         if shared.MOZJS:
             test([shared.MOZJS, '-m', outname])
         if shared.NODEJS:
+            test_src = open(s).read()
             if node_has_wasm or 'WebAssembly.' not in test_src:
                 test([shared.NODEJS, outname])
             else:
-                print('Skipping ' + basename + ' because WebAssembly might not be supported')
+                print('Skipping ' + s + ' because WebAssembly might not be supported')
 
 
 def update_binaryen_js_tests():
@@ -73,18 +90,10 @@ def update_binaryen_js_tests():
     print('\n[ checking binaryen.js testcases... ]\n')
     node_has_wasm = shared.NODEJS and support.node_has_webassembly(shared.NODEJS)
     for s in shared.get_tests(shared.get_test_dir('binaryen.js'), ['.js']):
-        basename = os.path.basename(s)
-        outname = os.path.splitext(basename)[0] + '.mjs'
-        f = open(outname, 'w')
-        # avoid stdout/stderr ordering issues in some js shells - use just stdout
-        f.write('console.warn = console.error = console.log;')
-        f.write(open(shared.BINARYEN_JS).read())
-        test_src = open(s).read()
-        f.write(support.js_test_wrap().replace('%TEST%', test_src))
-        f.close()
+        outname = make_js_test(s, shared.BINARYEN_JS)
 
         def update(cmd):
-            if 'fatal' not in basename:
+            if 'fatal' not in outname:
                 out = support.run_command(cmd, stderr=subprocess.STDOUT)
             else:
                 # expect an error - the specific error code will depend on the vm
@@ -93,12 +102,13 @@ def update(cmd):
                 o.write(out)
 
         # run in available shell
+        test_src = open(s).read()
         if shared.MOZJS:
             update([shared.MOZJS, '-m', outname])
         elif node_has_wasm or 'WebAssembly.' not in test_src:
             update([shared.NODEJS, outname])
         else:
-            print('Skipping ' + basename + ' because WebAssembly might not be supported')
+            print('Skipping ' + s + ' because WebAssembly might not be supported')
 
 
 def test_binaryen_js():

scripts/test/support.py

@@ -204,15 +204,3 @@ def run_command(cmd, expected_status=0, stderr=None,
 def node_has_webassembly(cmd):
     cmd = [cmd, '-e', 'process.stdout.write(typeof WebAssembly)']
     return run_command(cmd) == 'object'
-
-
-def js_test_wrap():
-    # common wrapper code for JS tests, waiting for binaryen.js to become ready
-    # and providing common utility used by all tests:
-    return '''
-        (async function __in_test_code__() {
-            var binaryen = await Binaryen()
-            function assert(x) { if (!x) throw Error('Test assertion failed'); }
-            %TEST%
-        })();
-    '''