[test] Allow flexible output suffix with build method. NFC (#23509)

Author: sbc100

test/common.py

@@ -1333,21 +1333,19 @@ def verify_es5(self, filename):
       self.fail('es-check failed to verify ES5 output compliance')
 
   # Build JavaScript code from source code
-  def build(self, filename, libraries=None, includes=None, force_c=False, js_outfile=True, emcc_args=None, output_basename=None):
+  def build(self, filename, libraries=None, includes=None, force_c=False, output_suffix='.js', emcc_args=None, output_basename=None):
     if not os.path.exists(filename):
       filename = test_file(filename)
-    suffix = '.js' if js_outfile else '.wasm'
     compiler = [compiler_for(filename, force_c)]
 
     if force_c:
       assert shared.suffix(filename) != '.c', 'force_c is not needed for source files ending in .c'
       compiler.append('-xc')
 
     if output_basename:
-      output = output_basename + suffix
+      output = output_basename + output_suffix
     else:
-      basename = os.path.basename(filename)
-      output = shared.unsuffixed(basename) + suffix
+      output = shared.unsuffixed_basename(filename) + output_suffix
     cmd = compiler + [filename, '-o', output] + self.get_emcc_args(main_file=True)
     if emcc_args:
       cmd += emcc_args

test/test_core.py

@@ -1908,7 +1908,7 @@ def test_em_asm_direct(self):
 
   @needs_dylink
   def test_em_asm_side_module(self):
-    self.build(test_file('core/test_em_asm_side.c'), js_outfile=False, emcc_args=['-sSIDE_MODULE'], output_basename='side')
+    self.build(test_file('core/test_em_asm_side.c'), output_suffix='.wasm', emcc_args=['-sSIDE_MODULE'], output_basename='side')
     self.do_core_test('test_em_asm_main.c', emcc_args=['-sMAIN_MODULE=2', 'side.wasm'])
 
   @parameterized({
@@ -3928,13 +3928,13 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
     # side settings
     self.clear_setting('MAIN_MODULE')
     self.set_setting('SIDE_MODULE')
-    side_suffix = 'wasm' if self.is_wasm() else 'js'
+    side_suffix = '.wasm' if self.is_wasm() else '.js'
     if isinstance(side, list):
-      out_file = 'liblib.' + side_suffix
+      out_file = 'liblib' + side_suffix
       # side is just a library
       self.run_process([EMCC] + side + self.get_emcc_args() + ['-o', out_file])
     else:
-      out_file = self.build(side, js_outfile=(side_suffix == 'js'))
+      out_file = self.build(side, output_suffix=side_suffix)
     shutil.move(out_file, os.path.join(so_dir, so_name))
 
     # main settings
@@ -4814,8 +4814,7 @@ def test_dylink_exceptions_try_catch_6(self):
     # side settings
     self.clear_setting('MAIN_MODULE')
     self.set_setting('SIDE_MODULE')
-    out_file = self.build('liblib.cpp', js_outfile=False)
-    shutil.move(out_file, "liblib.so")
+    self.build('liblib.cpp', output_suffix='.so')
 
     # main settings
     self.set_setting('MAIN_MODULE', 1)

test/test_other.py

@@ -13213,7 +13213,7 @@ def test_em_js_invalid(self):
 
   @crossplatform
   def test_em_js_side_module(self):
-    self.build(test_file('other/test_em_js_side.c'), js_outfile=False, emcc_args=['-sSIDE_MODULE'], output_basename='side')
+    self.build(test_file('other/test_em_js_side.c'), output_suffix='.wasm', emcc_args=['-sSIDE_MODULE'], output_basename='side')
     self.do_other_test('test_em_js_main.c', emcc_args=['-sMAIN_MODULE=2', 'side.wasm'])
 
   def test_em_js_main_module(self):