Skip to content

Commit c950207

Browse files
committed
Simplify test_sqlite. NFC
Also, ensure we don't pass `force_c` in tests that don't need it.
1 parent 37aa752 commit c950207

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

test/common.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ def build(self, filename, libraries=None, includes=None, force_c=False, js_outfi
650650
compiler.append('-sNO_DEFAULT_TO_CXX')
651651

652652
if force_c:
653+
assert shared.suffix(filename) != '.c', 'force_c is not needed for source files ending in .c'
653654
compiler.append('-xc')
654655

655656
if output_basename:
File renamed without changes.

test/test_core.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3799,7 +3799,7 @@ def test_dlfcn_longjmp(self):
37993799
pre 8
38003800
pre 9
38013801
out!
3802-
''', force_c=True)
3802+
''')
38033803

38043804
# TODO: make this work. need to forward tempRet0 across modules
38053805
# TODO Enable @with_both_eh_sjlj (the test is not working now)
@@ -4018,7 +4018,7 @@ def dylink_test(self, main, side, expected=None, header=None, force_c=False,
40184018
if header:
40194019
create_file('header.h', header)
40204020

4021-
return self.dylink_testf(main, side, expected, force_c, main_module=main_module, **kwargs)
4021+
return self.dylink_testf(main, side, expected, main_module=main_module, **kwargs)
40224022

40234023
def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_args=None,
40244024
main_module=2,
@@ -6718,11 +6718,7 @@ def test_sqlite(self, use_pthreads):
67186718
self.set_setting('USE_PTHREADS')
67196719
self.setup_node_pthreads()
67206720
self.emcc_args += ['-sUSE_SQLITE3']
6721-
self.do_run_from_file(
6722-
test_file('sqlite/benchmark.c'),
6723-
test_file('sqlite/benchmark.txt'),
6724-
force_c=True
6725-
)
6721+
self.do_run_in_out_file_test(test_file('sqlite/benchmark.c'))
67266722

67276723
@needs_make('mingw32-make')
67286724
@is_slow_test

0 commit comments

Comments
 (0)