Skip to content

[test] More use of do_runf helper. NFC #25805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −27
Open

[test] More use of do_runf helper. NFC #25805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 10 additions & 27 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,9 +1424,7 @@ def test_multiply_defined_libsymbols(self):
self.emcc('a2.c', ['-r', '-L.', '-lA', '-o', 'a2.o'])
self.emcc('b2.c', ['-r', '-L.', '-lA', '-o', 'b2.o'])

self.emcc('main.c', ['-L.', '-lA', 'a2.o', 'b2.o'])

self.assertContained('result: 1', self.run_js('a.out.js'))
self.do_runf('main.c', 'result: 1', cflags=['-L.', '-lA', 'a2.o', 'b2.o'])

def test_multiply_defined_libsymbols_2(self):
create_file('a.c', "int x() { return 55; }")
Expand All @@ -1449,9 +1447,7 @@ def test_multiply_defined_libsymbols_2(self):
building.emar('cr', 'libLIB.a', ['a.o', 'b.o']) # libLIB.a with a and b

# a is in the lib AND in an .o, so should be ignored in the lib. We do still need b from the lib though
self.emcc('main.c', ['a.o', 'c.o', '-L.', '-lLIB'])

self.assertContained('result: 62', self.run_js('a.out.js'))
self.do_runf('main.c', 'result: 62', cflags=['a.o', 'c.o', '-L.', '-lLIB'])

def test_link_group(self):
create_file('lib.c', 'int x() { return 42; }')
Expand Down Expand Up @@ -1724,12 +1720,8 @@ def test_export_all_and_exported_functions(self):
''')

# libfunc2 should not be linked by default, even with EXPORT_ALL
self.emcc('lib.c', ['-sEXPORT_ALL', '--pre-js', 'pre.js', '-o', 'a.out.js'])
err = self.run_js('a.out.js', assert_returncode=NON_ZERO)
self.assertContained('_libfunc2 is not defined', err)

self.emcc('lib.c', ['-sEXPORTED_FUNCTIONS=_libfunc2', '-sEXPORT_ALL', '--pre-js', 'pre.js', '-o', 'a.out.js'])
self.assertContained('libfunc\n', self.run_js('a.out.js'))
self.do_runf('lib.c', '_libfunc2 is not defined', cflags=['-sEXPORT_ALL', '--pre-js', 'pre.js'], assert_returncode=NON_ZERO)
self.do_runf('lib.c', 'libfunc\n', cflags=['-sEXPORTED_FUNCTIONS=_libfunc2', '-sEXPORT_ALL', '--pre-js', 'pre.js'])

@all_engines
@also_with_wasmfs
Expand Down Expand Up @@ -1910,8 +1902,7 @@ def test_multiple_archives_duplicate_basenames(self):
}
''')

self.run_process([EMCC, 'main.c', '-L.', '-la', '-lb'])
self.assertContained('a\nb\n', self.run_js('a.out.js'))
self.do_runf('main.c', 'a\nb\n', cflags=['-L.', '-la', '-lb'])

def test_archive_duplicate_basenames(self):
ensure_dir('a')
Expand Down Expand Up @@ -1962,9 +1953,7 @@ def test_archive_duplicate_basenames(self):

# With fastcomp we don't support duplicate members so this should generate
# a warning. With the wasm backend (lld) this is fully supported.
cmd = [EMCC, 'main.c', '-L.', '-ldup']
self.run_process(cmd)
self.assertContained('a\nb...\n', self.run_js('a.out.js'))
self.do_runf('main.c', 'a\nb...\n', cflags=['-L.', '-ldup'])

def test_export_from_archive(self):
export_name = 'this_is_an_entry_point'
Expand Down Expand Up @@ -2019,10 +2008,7 @@ def test_include_file(self, args):
}
''')

self.run_process([EMCC, 'main.c'] + args)
# run in node.js to ensure we verify that file preloading works there
result = self.run_js('a.out.js')
self.assertContained('|hello from a file wi|', result)
self.do_runf('main.c', '|hello from a file wi|', cflags=args)

@parameterized({
'': ([],),
Expand Down Expand Up @@ -9236,8 +9222,7 @@ def test_noderawfs_access_abspath(self):
return access(argv[1], F_OK);
}
''')
self.run_process([EMCC, 'access.c', '-sNODERAWFS'])
self.run_js('a.out.js', args=[os.path.abspath('foo')])
self.do_runf('access.c', cflags=['-sNODERAWFS'], args=[os.path.abspath('foo')])

def test_noderawfs_readfile_prerun(self):
create_file('foo', 'bar')
Expand Down Expand Up @@ -14371,8 +14356,7 @@ def test_emmalloc_in_addition(self, args):
# etc., and only provide the emmalloc_malloc etc. family of functions that
# we can use.
emmalloc = path_from_root('system', 'lib', 'emmalloc.c')
self.run_process([EMCC, test_file('other/test_emmalloc_in_addition.c'), emmalloc] + args)
self.assertContained('success', self.run_js('a.out.js'))
self.do_runf('other/test_emmalloc_in_addition.c', 'success', cflags=[emmalloc] + args)

def test_unused_destructor(self):
self.do_runf('other/test_unused_destructor.c', cflags=['-flto', '-O2'])
Expand Down Expand Up @@ -14739,8 +14723,7 @@ def test_rust_integration_basics(self):

def test_relative_em_cache(self):
with env_modify({'EM_CACHE': 'foo'}):
err = self.expect_fail([EMCC, '-c', test_file('hello_world.c')])
self.assertContained('emcc: error: environment variable EM_CACHE must be an absolute path: foo', err)
self.assert_fail([EMCC, '-c', test_file('hello_world.c')], 'emcc: error: environment variable EM_CACHE must be an absolute path: foo')

@crossplatform
def test_create_cache_directory(self):
Expand Down