Skip to content

Commit a3fa13b

Browse files
sbc100sbc100
authored
Remove unused files under tests/. NFC (emscripten-core#16093)
- tests/test_closure_annotations.js: This file was added emscripten-core#8990 but never actually referenced - tests/wasm/trap-f2i.cpp: last referenced in emscripten-core#11870
1 parent e7be51f commit a3fa13b

4 files changed

Lines changed: 15 additions & 39 deletions

File tree

‎tests/test_benchmark.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ def output_parser(output):
959959

960960
def lua(self, benchmark, expected, output_parser=None, args_processor=None):
961961
self.emcc_args.remove('-Werror')
962-
shutil.copyfile(test_file('third_party', 'lua', benchmark + '.lua'), benchmark + '.lua')
962+
shutil.copyfile(test_file(f'third_party/lua/{benchmark}.lua'), benchmark + '.lua')
963963

964964
def lib_builder(name, native, env_init):
965965
ret = self.get_library(os.path.join('third_party', 'lua_native' if native else 'lua'), [os.path.join('src', 'lua.o'), os.path.join('src', 'liblua.a')], make=['make', 'generic'], configure=None, native=native, cache_name_extra=name, env_init=env_init)
@@ -987,16 +987,16 @@ def test_zzz_lua_binarytrees(self):
987987

988988
def test_zzz_zlib(self):
989989
self.emcc_args.remove('-Werror')
990-
src = read_file(test_file('benchmark', 'test_zlib_benchmark.c'))
990+
src = read_file(test_file('benchmark/test_zlib_benchmark.c'))
991991

992992
def lib_builder(name, native, env_init):
993993
return self.get_library(os.path.join('third_party', 'zlib'), os.path.join('libz.a'), make_args=['libz.a'], native=native, cache_name_extra=name, env_init=env_init)
994994

995995
self.do_benchmark('zlib', src, 'ok.',
996-
force_c=True, shared_args=['-I' + test_file('third_party', 'zlib')], lib_builder=lib_builder)
996+
force_c=True, shared_args=['-I' + test_file('third_party/zlib')], lib_builder=lib_builder)
997997

998998
def test_zzz_coremark(self):
999-
src = read_file(test_file('third_party', 'coremark', 'core_main.c'))
999+
src = read_file(test_file('third_party/coremark/core_main.c'))
10001000

10011001
def lib_builder(name, native, env_init):
10021002
return self.get_library('third_party/coremark', [os.path.join('coremark.a')], configure=None, native=native, cache_name_extra=name, env_init=env_init)
@@ -1005,15 +1005,15 @@ def output_parser(output):
10051005
iters_sec = re.search(r'Iterations/Sec : ([\d\.]+)', output).group(1)
10061006
return 100000.0 / float(iters_sec)
10071007

1008-
self.do_benchmark('coremark', src, 'Correct operation validated.', shared_args=['-I' + test_file('third_party', 'coremark')], lib_builder=lib_builder, output_parser=output_parser, force_c=True)
1008+
self.do_benchmark('coremark', src, 'Correct operation validated.', shared_args=['-I' + test_file('third_party/coremark')], lib_builder=lib_builder, output_parser=output_parser, force_c=True)
10091009

10101010
def test_zzz_box2d(self):
1011-
src = read_file(test_file('benchmark', 'test_box2d_benchmark.cpp'))
1011+
src = read_file(test_file('benchmark/test_box2d_benchmark.cpp'))
10121012

10131013
def lib_builder(name, native, env_init):
10141014
return self.get_library(os.path.join('third_party', 'box2d'), ['box2d.a'], configure=None, native=native, cache_name_extra=name, env_init=env_init)
10151015

1016-
self.do_benchmark('box2d', src, 'frame averages', shared_args=['-I' + test_file('third_party', 'box2d')], lib_builder=lib_builder)
1016+
self.do_benchmark('box2d', src, 'frame averages', shared_args=['-I' + test_file('third_party/box2d')], lib_builder=lib_builder)
10171017

10181018
def test_zzz_bullet(self):
10191019
self.emcc_args.remove('-Werror')
@@ -1038,16 +1038,16 @@ def lib_builder(name, native, env_init):
10381038
lib_builder=lib_builder)
10391039

10401040
def test_zzz_lzma(self):
1041-
src = read_file(test_file('benchmark', 'test_lzma_benchmark.c'))
1041+
src = read_file(test_file('benchmark/test_lzma_benchmark.c'))
10421042

10431043
def lib_builder(name, native, env_init):
10441044
return self.get_library(os.path.join('third_party', 'lzma'), [os.path.join('lzma.a')], configure=None, native=native, cache_name_extra=name, env_init=env_init)
10451045

1046-
self.do_benchmark('lzma', src, 'ok.', shared_args=['-I' + test_file('third_party', 'lzma')], lib_builder=lib_builder)
1046+
self.do_benchmark('lzma', src, 'ok.', shared_args=['-I' + test_file('third_party/lzma')], lib_builder=lib_builder)
10471047

10481048
def test_zzz_sqlite(self):
10491049
src = read_file(test_file('third_party/sqlite/sqlite3.c')) + read_file(test_file('sqlite/speedtest1.c'))
1050-
self.do_benchmark('sqlite', src, 'TOTAL...', native_args=['-ldl', '-pthread'], shared_args=['-I' + test_file('third_party', 'sqlite')],
1050+
self.do_benchmark('sqlite', src, 'TOTAL...', native_args=['-ldl', '-pthread'], shared_args=['-I' + test_file('third_part/sqlite')],
10511051
emcc_args=['-sFILESYSTEM', '-sMINIMAL_RUNTIME=0'], # not minimal because of files
10521052
force_c=True)
10531053

@@ -1096,8 +1096,8 @@ def lib_builder(name, native, env_init):
10961096

10971097
# TODO: Fix poppler native build and remove skip_native=True
10981098
self.do_benchmark('poppler', '', 'hashed printout',
1099-
shared_args=['-I' + test_file('poppler', 'include'), '-I' + test_file('freetype', 'include')],
1099+
shared_args=['-I' + test_file('poppler/include'), '-I' + test_file('freetype/include')],
11001100
emcc_args=['-sFILESYSTEM', '--pre-js', 'pre.js', '--embed-file',
1101-
test_file('poppler', 'emscripten_html5.pdf') + '@input.pdf', '-sERROR_ON_UNDEFINED_SYMBOLS=0',
1101+
test_file('poppler/emscripten_html5.pdf') + '@input.pdf', '-sERROR_ON_UNDEFINED_SYMBOLS=0',
11021102
'-sMINIMAL_RUNTIME=0'], # not minimal because of files
11031103
lib_builder=lib_builder, skip_native=True)

‎tests/test_closure_annotations.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎tests/wasm/trap-f2i.cpp‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎tools/maint/check_for_unused_test_files.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
ignore_dirs = {
1616
'third_party',
1717
'metadce',
18+
'cmake',
1819
'__pycache__',
1920
}
2021
ignore_files = {
2122
'getValue_setValue_assert.out',
23+
'test_emsize.wasm',
2224
'legacy_exported_runtime_numbers_assert.out',
25+
'test_asyncify_during_exit_no_async.out',
2326
}
2427
ignore_root_patterns = ['runner.*', 'test_*.py']
2528
ignore_root_files = {

0 commit comments

Comments
 (0)