Extend test_other.test_mainScriptUrlOrBlob and refactor tests

Author: JoeOsborn

test/pthread/main_js_with_loader.html

@@ -147,8 +147,6 @@
       };
     </script>
 
-    <!-- Exactly one of these two scripts will exist -->
-    <script src="loader.js"></script>
     <script type="module" src="loader.mjs"></script>
   </body>
 </html>

test/test_browser.py

@@ -4767,37 +4767,31 @@ def test_pthread_reltime(self):
   def test_mainScriptUrlOrBlob(self, es6, use_blob):
     # TODO: enable this with wasm, currently pthreads/atomics have limitations
     self.set_setting('EXIT_RUNTIME')
-    js_name = 'hello_thread_with_loader.js'
-    ext = '.js'
+    js_name = 'hello_thread_with_loader.%s' % ('mjs' if es6 else 'js')
     if es6:
-      ext = '.mjs'
       self.emcc_args += ['-sEXPORT_ES6']
-      js_name = 'hello_thread_with_loader.mjs'
     if es6 and use_blob:
       create_file('loader.mjs', '''
         Module['locateFile'] = (path,_prefix) => path;
-        fetch('hello_thread_with_loader.mjs').then((rsp) => rsp.blob().then((blob) => {
-          Module['mainScriptUrlOrBlob'] = blob;
-          import(URL.createObjectURL(blob)).then((fac) => fac.default(Module))
-        }));
+        let blob = await (await fetch('hello_thread_with_loader.mjs')).blob();
+        Module['mainScriptUrlOrBlob'] = blob;
+        (await import(URL.createObjectURL(blob))).default(Module);
       ''')
     elif use_blob:
-      create_file('loader.js', '''
-        Module['locateFile'] = (path,_prefix) => path;
-        fetch('hello_thread_with_loader.js').then((rsp) => rsp.blob().then((blob) => {
+      create_file('loader.mjs', '''
+        let blob = await (await fetch('hello_thread_with_loader.js')).blob();
         Module['mainScriptUrlOrBlob'] = blob;
         var script = document.createElement('script');
         script.src = URL.createObjectURL(blob);
         document.body.appendChild(script);
-        }));
       ''')
     elif es6:
       create_file('loader.mjs', '''
         Module['mainScriptUrlOrBlob'] = 'hello_thread_with_loader.mjs';
-        import('./'+Module['mainScriptUrlOrBlob']).then((fac) => fac.default(Module))
+        (await import('./hello_thread_with_loader.mjs')).default(Module);
       ''')
     else:
-      create_file('loader.js', '''
+      create_file('loader.mjs', '''
         var script = document.createElement('script');
         Module['mainScriptUrlOrBlob'] = 'hello_thread_with_loader.js';
         script.src = Module['mainScriptUrlOrBlob'];

test/test_other.py

@@ -15805,15 +15805,31 @@ def test_rollup(self):
   def test_rlimit(self):
     self.do_other_test('test_rlimit.c', emcc_args=['-O1'])
 
-  def test_mainScriptUrlOrBlob(self):
+  @parameterized({
+    '': (False, False),
+    'es6': (True, False),
+  })
+  def test_mainScriptUrlOrBlob(self, es6, use_blob):
     # Use `foo.js` instead of the current script name when creating new threads
-    create_file('pre.js', 'Module = { mainScriptUrlOrBlob: "./foo.js" }')
-    self.run_process([EMCC, test_file('hello_world.c'), '-sEXIT_RUNTIME', '-sPROXY_TO_PTHREAD', '-pthread', '--pre-js=pre.js'])
-
-    # First run without foo.js present to verify that the pthread creation fails
-    err = self.run_js('a.out.js', assert_returncode=NON_ZERO)
-    self.assertContained('Cannot find module.*foo.js', err, regex=True)
-
-    # Now create foo.js and the program should run as expected.
-    shutil.copy('a.out.js', 'foo.js')
-    self.assertContained('hello, world', self.run_js('a.out.js'))
+    if es6:
+      self.emcc_args += ['-sEXPORT_ES6']
+      create_file('pre.js', '')
+      create_file('run.mjs', 'import("./foo.mjs").then((fac) => fac.default({mainScriptUrlOrBlob:"./foo.mjs"}))')
+      binfile = 'a.out.mjs'
+      real_binfile = 'foo.mjs'
+      runfile = 'run.mjs'
+    else:
+      create_file('pre.js', 'Module = { mainScriptUrlOrBlob: "./foo.js" }')
+      binfile = 'a.out.js'
+      real_binfile = 'foo.js'
+      runfile = binfile
+
+    self.run_process([EMCC, test_file('hello_world.c'), '-sEXIT_RUNTIME', '-sPROXY_TO_PTHREAD', '-pthread', '--pre-js=pre.js', '-o', binfile])
+
+    # First run without foo.{mjs,js} present to verify that the pthread creation fails
+    err = self.run_js(runfile, assert_returncode=NON_ZERO)
+    self.assertContained('Cannot find module.*foo', err, regex=True)
+    
+    # Now create foo.{mjs,js} and the program should run as expected.
+    shutil.copy(binfile, real_binfile)
+    self.assertContained('hello, world', self.run_js(runfile))