Temporarily modify wasm2js expectations to allow binaryen change to roll in. (#17860)

Author: sbc100

test/test_other.py

@@ -9455,7 +9455,8 @@ def test(args, closure, opt):
 
   @parameterized({
     'hello_world_wasm': ('hello_world', False, True),
-    'hello_world_wasm2js': ('hello_world', True, True),
+    # Temporarily disabled compare_js_output here while https://github.com/WebAssembly/binaryen/pull/5018 rolls in
+    'hello_world_wasm2js': ('hello_world', True, False),
     'random_printf_wasm': ('random_printf', False),
     'random_printf_wasm2js': ('random_printf', True),
     'hello_webgl_wasm': ('hello_webgl', False),

tools/maybe_wasm2js.py

@@ -45,8 +45,12 @@
 cmd += opts
 js = shared.run_process(cmd, stdout=subprocess.PIPE).stdout
 # assign the instantiate function to where it will be used
-js = shared.do_replace(js, 'function instantiate(asmLibraryArg) {',
-                       "Module['__wasm2jsInstantiate__'] = function(asmLibraryArg) {")
+if 'instantiate(asmLibraryArg)' in js:
+  js = shared.do_replace(js, 'function instantiate(asmLibraryArg) {',
+                         "Module['__wasm2jsInstantiate__'] = function(asmLibraryArg) {")
+else:
+  js = shared.do_replace(js, 'function instantiate(info) {',
+                         "Module['__wasm2jsInstantiate__'] = function(info) {")
 
 # create the combined js to run in wasm2js mode
 print('var Module = { doWasm2JS: true };\n')