Skip to content

Commit ffac9a6

Browse files
authored
Remove test harness support for .js side modules. NFC (#24311)
We don't support js side modules and have not since the asm.js days.
1 parent d6482c8 commit ffac9a6

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

test/test_core.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3976,20 +3976,19 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
39763976
# side settings
39773977
self.clear_setting('MAIN_MODULE')
39783978
self.set_setting('SIDE_MODULE')
3979-
side_suffix = '.wasm' if self.is_wasm() else '.js'
3979+
so_file = os.path.join(so_dir, so_name)
39803980
if isinstance(side, list):
3981-
out_file = 'liblib' + side_suffix
39823981
# side is just a library
3983-
self.run_process([EMCC] + side + self.get_emcc_args() + ['-o', out_file])
3982+
self.run_process([EMCC] + side + self.get_emcc_args() + ['-o', so_file])
39843983
else:
3985-
out_file = self.build(side, output_suffix=side_suffix)
3986-
shutil.move(out_file, os.path.join(so_dir, so_name))
3984+
out_file = self.build(side, output_suffix='.so')
3985+
shutil.move(out_file, so_file)
39873986

39883987
# main settings
39893988
self.set_setting('MAIN_MODULE', main_module)
39903989
self.clear_setting('SIDE_MODULE')
39913990
self.emcc_args += main_emcc_args
3992-
self.emcc_args.append(os.path.join(so_dir, so_name))
3991+
self.emcc_args.append(so_file)
39933992

39943993
if force_c:
39953994
self.emcc_args.append('-nostdlib++')

0 commit comments

Comments
 (0)