Skip to content

Commit d4cf40c

Browse files
authored
Simplify test_sqlite. NFC (#17712)
Also, ensure we don't pass `force_c` in tests that don't need it.
1 parent 0563c4c commit d4cf40c

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
@@ -3806,7 +3806,7 @@ def test_dlfcn_longjmp(self):
38063806
pre 8
38073807
pre 9
38083808
out!
3809-
''', force_c=True)
3809+
''')
38103810

38113811
# TODO: make this work. need to forward tempRet0 across modules
38123812
# TODO Enable @with_both_eh_sjlj (the test is not working now)
@@ -4025,7 +4025,7 @@ def dylink_test(self, main, side, expected=None, header=None, force_c=False,
40254025
if header:
40264026
create_file('header.h', header)
40274027

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

40304030
def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_args=None,
40314031
main_module=2,
@@ -6736,11 +6736,7 @@ def test_sqlite(self, use_pthreads):
67366736
self.set_setting('USE_PTHREADS')
67376737
self.setup_node_pthreads()
67386738
self.emcc_args += ['-sUSE_SQLITE3']
6739-
self.do_run_from_file(
6740-
test_file('sqlite/benchmark.c'),
6741-
test_file('sqlite/benchmark.txt'),
6742-
force_c=True
6743-
)
6739+
self.do_run_in_out_file_test(test_file('sqlite/benchmark.c'))
67446740

67456741
@needs_make('mingw32-make')
67466742
@is_slow_test

0 commit comments

Comments
 (0)