Avoid using --proxy-to-worker in workerfs tests. NFC (emscripten-core#25816)

Instead just manually run the program in a new worker.

Author: sbc100

test/browser_common.py

@@ -908,13 +908,17 @@ def btest(self, filename, expected=None,
             cflags=None,
             timeout=None,
             reporting=Reporting.FULL,
+            run_in_worker=False,
             output_basename='test'):
     assert expected, 'a btest must have an expected output'
     if cflags is None:
       cflags = []
     cflags = cflags.copy()
     filename = find_browser_test_file(filename)
-    outfile = output_basename + '.html'
+    if run_in_worker:
+      outfile = output_basename + '.js'
+    else:
+      outfile = output_basename + '.html'
     cflags += ['-o', outfile]
     # print('cflags:', cflags)
     utils.delete_file(outfile)
@@ -927,7 +931,15 @@ def btest(self, filename, expected=None,
     if EMTEST_BROWSER == 'node':
       nodejs = self.require_node()
       self.node_args += shared.node_pthread_flags(nodejs)
-      output = self.run_js('test.js')
+      output = self.run_js(f'{output_basename}.js')
       self.assertContained('RESULT: ' + expected[0], output)
     else:
-      self.run_browser(outfile, expected=['/report_result?' + e for e in expected], timeout=timeout)
+      html_file = outfile
+      if run_in_worker:
+        create_file('run_worker.html', f'''\
+          <script>
+            new Worker('{output_basename}.js');
+          </script>
+          ''')
+        html_file = 'run_worker.html'
+      self.run_browser(html_file, expected=['/report_result?' + e for e in expected], timeout=timeout)

test/fs/test_workerfs.c

@@ -98,11 +98,13 @@ void test_readlink() {
 }
 
 int main() {
+  printf("in main\n");
   test_no_exist();
   test_blob_txt();
   test_file_txt();
   test_chmod();
   test_readdir();
   test_readlink();
+  printf("done\n");
   return 0;
 }

test/fs/test_workerfs_package.c

@@ -36,7 +36,7 @@ void EMSCRIPTEN_KEEPALIVE finish() {
 
   // all done
   printf("success\n");
-  REPORT_RESULT(1);
+  REPORT_RESULT(0);
 }
 
 int main() {
@@ -80,6 +80,6 @@ int main() {
 
   emscripten_exit_with_live_runtime();
 
-  return 1;
+  return 99;
 }
 

test/test_browser.py

@@ -1432,14 +1432,14 @@ def test_fs_workerfs(self):
         }, '/work');
       };
     ''')
-    self.btest_exit('fs/test_workerfs.c', cflags=['-lworkerfs.js', '--pre-js', 'pre.js', '--proxy-to-worker', '-Wno-deprecated', '-lworkerfs.js'])
+    self.btest_exit('fs/test_workerfs.c', cflags=['-lworkerfs.js', '--pre-js', 'pre.js'], run_in_worker=True)
 
   def test_fs_workerfs_package(self):
     create_file('file1.txt', 'first')
     ensure_dir('sub')
     create_file('sub/file2.txt', 'second')
     self.run_process([FILE_PACKAGER, 'files.data', '--preload', 'file1.txt', 'sub/file2.txt', '--separate-metadata', '--js-output=files.js'])
-    self.btest('fs/test_workerfs_package.c', '1', cflags=['-lworkerfs.js', '--proxy-to-worker', '-Wno-deprecated', '-lworkerfs.js'])
+    self.btest('fs/test_workerfs_package.c', '0', cflags=['-lworkerfs.js'], run_in_worker=True)
 
   def test_fs_lz4fs_package(self):
     # generate data
@@ -1691,8 +1691,7 @@ def test_mmap_lazyfile(self):
         FS.createLazyFile('/', "lazy.txt", "lazydata.dat", true, false);
       }
     ''')
-    self.cflags += ['--pre-js=pre.js', '--proxy-to-worker', '-Wno-deprecated']
-    self.btest_exit('test_mmap_lazyfile.c')
+    self.btest_exit('test_mmap_lazyfile.c', cflags=['--pre-js=pre.js'], run_in_worker=True)
 
   @no_wasmfs('https://github.com/emscripten-core/emscripten/issues/19608')
   @no_firefox('keeps sending OPTIONS requests, and eventually errors')
@@ -3634,8 +3633,8 @@ def test_dlopen_blocking(self):
   # verify that dynamic linking works in all kinds of in-browser environments.
   # don't mix different kinds in a single test.
   @parameterized({
-    '': (0,),
-    'inworker': (1,),
+    '': (False,),
+    'inworker': (True,),
   })
   def test_dylink_dso_needed(self, inworker):
     if not inworker:
@@ -3669,10 +3668,7 @@ def do_run(src, expected_output, cflags):
           return rtn;
         }
       ''' % expected_output)
-      # --proxy-to-worker only when linking the main module
-      if inworker:
-        cflags += ['--proxy-to-worker', '-Wno-deprecated']
-      self.btest_exit('test_dylink_dso_needed.c', cflags=['--post-js', 'post.js'] + cflags)
+      self.btest_exit('test_dylink_dso_needed.c', cflags=['--post-js', 'post.js'] + cflags, run_in_worker=inworker)
 
     self._test_dylink_dso_needed(do_run)
 
@@ -4651,12 +4647,12 @@ def test_fetch_sync(self):
     shutil.copy(test_file('gears.png'), '.')
     self.btest_exit('fetch/test_fetch_sync.c', cflags=['-sFETCH', '-pthread', '-sPROXY_TO_PTHREAD'])
 
-  # Tests that the Fetch API works for synchronous XHRs when used with --proxy-to-worker.
+  # Tests that the Fetch API works for synchronous XHRs when program is run in a worker
   @no_firefox('https://github.com/emscripten-core/emscripten/issues/16868')
   @also_with_wasm2js
   def test_fetch_sync_xhr_in_proxy_to_worker(self):
     shutil.copy(test_file('gears.png'), '.')
-    self.btest_exit('fetch/test_fetch_sync_xhr.cpp', cflags=['-sFETCH_DEBUG', '-sFETCH', '--proxy-to-worker', '-Wno-deprecated'])
+    self.btest_exit('fetch/test_fetch_sync_xhr.cpp', cflags=['-sFETCH_DEBUG', '-sFETCH'], run_in_worker=True)
 
   @disabled('https://github.com/emscripten-core/emscripten/issues/16746')
   def test_fetch_idb_store(self):
@@ -4914,11 +4910,7 @@ def test_single_file_locate_file(self):
 
   # Tests that SINGLE_FILE works as intended in a Worker in JS output
   def test_single_file_worker_js(self):
-    self.compile_btest('browser_test_hello_world.c', ['-o', 'test.js', '--proxy-to-worker', '-Wno-deprecated', '-sSINGLE_FILE'])
-    create_file('test.html', '<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"></head><body><script src="test.js"></script></body></html>')
-    self.run_browser('test.html', '/report_result?0')
-    self.assertExists('test.js')
-    self.assertNotExists('test.worker.js')
+    self.btest_exit('browser_test_hello_world.c', cflags=['-sSINGLE_FILE'], run_in_worker=True)
 
   # Tests that pthreads code works as intended in a Worker. That is, a pthreads-using
   # program can run either on the main thread (normal tests) or when we start it in
@@ -4929,14 +4921,7 @@ def test_single_file_worker_js(self):
     'limited_env': (['-sENVIRONMENT=worker'],),
   })
   def test_pthreads_started_in_worker(self, args):
-    self.set_setting('EXIT_RUNTIME')
-    self.compile_btest('pthread/test_pthread_atomics.c', ['-o', 'test.js', '-pthread', '-sPTHREAD_POOL_SIZE=8'] + args, reporting=Reporting.JS_ONLY)
-    create_file('test.html', '''
-      <script>
-        new Worker('test.js');
-      </script>
-    ''')
-    self.run_browser('test.html', '/report_result?exit:0')
+    self.btest_exit('pthread/test_pthread_atomics.c', cflags=['-o', 'test.js', '-pthread', '-sPTHREAD_POOL_SIZE=8'] + args, run_in_worker=True)
 
   def test_access_file_after_heap_resize(self):
     create_file('test.txt', 'hello from file')