Cleanup test_emrun. NFC (#22256)

Author: sbc100

test/test_browser.py

@@ -5429,28 +5429,29 @@ def test_no_browser(self):
       proc.terminate()
       proc.wait()
 
+  def test_program_arg_separator(self):
+    # Verify that trying to pass argument to the page without the `--` separator will
+    # generate an actionable error message
+    err = self.expect_fail([EMRUN, '--foo'])
+    self.assertContained('error: unrecognized arguments: --foo', err)
+    self.assertContained('remember to add `--` between arguments', err)
+
   def test_emrun(self):
-    self.run_process([EMCC, test_file('test_emrun.c'), '--emrun', '-o', 'hello_world.html'])
+    self.emcc(test_file('test_emrun.c'), ['--emrun', '-o', 'test_emrun.html'])
     if not has_browser():
       self.skipTest('need a browser')
 
     # We cannot run emrun from the temp directory the suite will clean up afterwards, since the
     # browser that is launched will have that directory as startup directory, and the browser will
     # not close as part of the test, pinning down the cwd on Windows and it wouldn't be possible to
     # delete it. Therefore switch away from that directory before launching.
-
     os.chdir(path_from_root())
+
     args_base = [EMRUN, '--timeout', '30', '--safe_firefox_profile',
                  '--kill-exit', '--port', '6939', '--verbose',
                  '--log-stdout', self.in_dir('stdout.txt'),
                  '--log-stderr', self.in_dir('stderr.txt')]
 
-    # Verify that trying to pass argument to the page without the `--` separator will
-    # generate an actionable error message
-    err = self.expect_fail(args_base + ['--foo'])
-    self.assertContained('error: unrecognized arguments: --foo', err)
-    self.assertContained('remember to add `--` between arguments', err)
-
     if EMTEST_BROWSER is not None:
       # If EMTEST_BROWSER carried command line arguments to pass to the browser,
       # (e.g. "firefox -profile /path/to/foo") those can't be passed via emrun,
@@ -5470,13 +5471,13 @@ def test_emrun(self):
           args_base += ['--browser_args', ' ' + ' '.join(browser_args)]
 
     for args in [
-        args_base,
-        args_base + ['--port', '0'],
-        args_base + ['--private_browsing', '--port', '6941'],
-        args_base + ['--dump_out_directory', 'other dir/multiple', '--port', '6942'],
-        args_base + ['--dump_out_directory=foo_bar', '--port', '6942'],
+        [],
+        ['--port', '0'],
+        ['--private_browsing', '--port', '6941'],
+        ['--dump_out_directory', 'other dir/multiple', '--port', '6942'],
+        ['--dump_out_directory=foo_bar', '--port', '6942'],
     ]:
-      args += [self.in_dir('hello_world.html'), '--', '1', '2', '--3', 'escaped space', 'with_underscore']
+      args = args_base + args + [self.in_dir('test_emrun.html'), '--', '1', '2', '--3', 'escaped space', 'with_underscore']
       print(shared.shlex_join(args))
       proc = self.run_process(args, check=False)
       self.assertEqual(proc.returncode, 100)

test/test_emrun.c

@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <emscripten.h>
@@ -14,15 +15,13 @@ int main(int argc, char **argv) {
   for (int i = 0; i < argc; ++i) {
     printf("argv[%d]: %s\n", i, argv[i]);
   }
+  assert(argc > 1);
 
   // Dump a file to local filesystem with emrun.
   EM_ASM(emrun_file_dump("test.dat", HEAPU8.subarray(0, 128)););
   EM_ASM(emrun_file_dump("heap.dat", HEAPU8));
   EM_ASM(emrun_file_dump("nested/with space.dat", HEAPU8.subarray(128, 256)););
 
-  if (argc <= 1) {
-    exit(1);
-  }
   printf("hello, world!\n");
   fprintf(stderr, "hello, error stream!\n");