Add test of EM_JS + USE_PRTHREADS (#16574)

I realized we didn't have any testing of this configuration (at
least not under node).

See #16573

Author: sbc100

.circleci/config.yml

@@ -349,7 +349,9 @@ jobs:
       EMCC_READ_METADATA: "compare"
     steps:
       - run-tests-linux:
-          test_targets: "core0"
+          # test_em_js_pthreads current triggers a bug in python metadata
+          # extraction: https://github.com/emscripten-core/emscripten/issues/16573
+          test_targets: "core0 skip:core0.test_em_js_pthreads"
   test-core2:
     executor: bionic
     environment:

tests/common.py

@@ -190,12 +190,7 @@ def decorated(self, *args, **kwargs):
 
 def node_pthreads(f):
   def decorated(self, *args, **kwargs):
-    self.set_setting('USE_PTHREADS')
-    self.emcc_args += ['-Wno-pthreads-mem-growth']
-    if self.get_setting('MINIMAL_RUNTIME'):
-      self.skipTest('node pthreads not yet supported with MINIMAL_RUNTIME')
-    self.js_engines = [config.NODE_JS]
-    self.node_args += ['--experimental-wasm-threads', '--experimental-wasm-bulk-memory']
+    self.setup_node_pthreads()
     f(self, *args, **kwargs)
   return decorated
 
@@ -397,6 +392,15 @@ def require_node(self):
         self.fail('node required to run this test.  Use EMTEST_SKIP_NODE to skip')
     self.js_engines = [config.NODE_JS]
 
+  def setup_node_pthreads(self):
+    self.require_node()
+    self.set_setting('USE_PTHREADS')
+    self.emcc_args += ['-Wno-pthreads-mem-growth']
+    if self.get_setting('MINIMAL_RUNTIME'):
+      self.skipTest('node pthreads not yet supported with MINIMAL_RUNTIME')
+    self.js_engines = [config.NODE_JS]
+    self.node_args += ['--experimental-wasm-threads', '--experimental-wasm-bulk-memory']
+
   def uses_memory_init_file(self):
     if self.get_setting('SIDE_MODULE') or (self.is_wasm() and not self.get_setting('WASM2JS')):
       return False

tests/test_core.py

@@ -2114,16 +2114,19 @@ def test_em_asm_direct(self):
 
   @parameterized({
     '': ([], False),
+    'pthreads': (['-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'], False),
     'c': ([], True),
     'linked': (['-sMAIN_MODULE'], False),
     'linked_c': (['-sMAIN_MODULE'], True),
   })
   def test_em_js(self, args, force_c):
     if '-sMAIN_MODULE' in args:
       self.check_dylink()
-    self.emcc_args += args
-    if '-sMAIN_MODULE' not in args:
+    else:
       self.emcc_args += ['-sEXPORTED_FUNCTIONS=_main,_malloc']
+    self.emcc_args += args
+    if '-sUSE_PTHREADS' in args:
+      self.setup_node_pthreads()
 
     self.do_core_test('test_em_js.cpp', force_c=force_c)
     self.assertContained("no args returning int", read_file('test_em_js.js'))