tests: Remove force_c paramater from btest method. NFC (#13300)
Since we started passing the filename all the way through to the compiler (See #13112) this argument has been completely ignored.
This commit is contained in:
Sam Clegg
GitHub
Родитель
f236e5de8f
Коммит
1f4a74860a
|
|
@ -1519,7 +1519,7 @@ class BrowserCore(RunnerCore):
|
|||
kwargs['expected'] = 'exit:%s' % expected
|
||||
return self.btest(filename, *args, **kwargs)
|
||||
|
||||
def btest(self, filename, expected=None, reference=None, force_c=False,
|
||||
def btest(self, filename, expected=None, reference=None,
|
||||
reference_slack=0, manual_reference=False, post_build=None,
|
||||
args=None, message='.', also_proxied=False,
|
||||
url_suffix='', timeout=None, also_asmjs=False,
|
||||
|
|
@ -1552,7 +1552,7 @@ class BrowserCore(RunnerCore):
|
|||
# Tests can opt into being run under asmjs as well
|
||||
if 'WASM=0' not in original_args and (also_asmjs or self.also_asmjs):
|
||||
print('WASM=0')
|
||||
self.btest(filename, expected, reference, force_c, reference_slack, manual_reference, post_build,
|
||||
self.btest(filename, expected, reference, reference_slack, manual_reference, post_build,
|
||||
original_args + ['-s', 'WASM=0'], message, also_proxied=False, timeout=timeout)
|
||||
|
||||
if also_proxied:
|
||||
|
|
@ -1563,7 +1563,7 @@ class BrowserCore(RunnerCore):
|
|||
assert not post_build
|
||||
post_build = self.post_manual_reftest
|
||||
# run proxied
|
||||
self.btest(filename, expected, reference, force_c, reference_slack, manual_reference, post_build,
|
||||
self.btest(filename, expected, reference, reference_slack, manual_reference, post_build,
|
||||
original_args + ['--proxy-to-worker', '-s', 'GL_TESTING'], message, timeout=timeout)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1268,13 +1268,13 @@ keydown(100);keyup(100); // trigger the end
|
|||
def test_fs_idbfs_sync(self):
|
||||
for extra in [[], ['-DEXTRA_WORK']]:
|
||||
secret = str(time.time())
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', force_c=True, args=['-lidbfs.js', '-DFIRST', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', force_c=True, args=['-lidbfs.js', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-lidbfs.js'] + extra)
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', args=['-lidbfs.js', '-DFIRST', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', args=['-lidbfs.js', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-lidbfs.js'] + extra)
|
||||
|
||||
def test_fs_idbfs_sync_force_exit(self):
|
||||
secret = str(time.time())
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', force_c=True, args=['-lidbfs.js', '-DFIRST', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-s', 'EXIT_RUNTIME', '-DFORCE_EXIT', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', force_c=True, args=['-lidbfs.js', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-s', 'EXIT_RUNTIME', '-DFORCE_EXIT', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', args=['-lidbfs.js', '-DFIRST', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-s', 'EXIT_RUNTIME', '-DFORCE_EXIT', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_sync.c'), '1', args=['-lidbfs.js', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_test', '_success']''', '-s', 'EXIT_RUNTIME', '-DFORCE_EXIT', '-lidbfs.js'])
|
||||
|
||||
def test_fs_idbfs_fsync(self):
|
||||
# sync from persisted state into memory before main()
|
||||
|
|
@ -1293,13 +1293,13 @@ keydown(100);keyup(100); // trigger the end
|
|||
|
||||
args = ['--pre-js', 'pre.js', '-lidbfs.js', '-s', 'EXIT_RUNTIME'] + self.get_async_args()
|
||||
secret = str(time.time())
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_fsync.c'), '1', force_c=True, args=args + ['-DFIRST', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_success']''', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_fsync.c'), '1', force_c=True, args=args + ['-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_success']''', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_fsync.c'), '1', args=args + ['-DFIRST', '-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_success']''', '-lidbfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_idbfs_fsync.c'), '1', args=args + ['-DSECRET=\"' + secret + '\"', '-s', '''EXPORTED_FUNCTIONS=['_main', '_success']''', '-lidbfs.js'])
|
||||
|
||||
def test_fs_memfs_fsync(self):
|
||||
args = self.get_async_args() + ['-s', 'EXIT_RUNTIME']
|
||||
secret = str(time.time())
|
||||
self.btest(path_from_root('tests', 'fs', 'test_memfs_fsync.c'), '1', force_c=True, args=args + ['-DSECRET=\"' + secret + '\"'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_memfs_fsync.c'), '1', args=args + ['-DSECRET=\"' + secret + '\"'])
|
||||
|
||||
def test_fs_workerfs_read(self):
|
||||
secret = 'a' * 10
|
||||
|
|
@ -1316,7 +1316,7 @@ keydown(100);keyup(100); // trigger the end
|
|||
}, '/work');
|
||||
};
|
||||
''' % (secret, secret2))
|
||||
self.btest(path_from_root('tests', 'fs', 'test_workerfs_read.c'), '1', force_c=True, args=['-lworkerfs.js', '--pre-js', 'pre.js', '-DSECRET=\"' + secret + '\"', '-DSECRET2=\"' + secret2 + '\"', '--proxy-to-worker', '-lworkerfs.js'])
|
||||
self.btest(path_from_root('tests', 'fs', 'test_workerfs_read.c'), '1', args=['-lworkerfs.js', '--pre-js', 'pre.js', '-DSECRET=\"' + secret + '\"', '-DSECRET2=\"' + secret2 + '\"', '--proxy-to-worker', '-lworkerfs.js'])
|
||||
|
||||
def test_fs_workerfs_package(self):
|
||||
create_test_file('file1.txt', 'first')
|
||||
|
|
@ -1392,20 +1392,20 @@ keydown(100);keyup(100); // trigger the end
|
|||
secret = str(time.time())
|
||||
for stage in [0, 1, 2, 3, 0, 1, 2, 0, 0, 1, 4, 2, 5]:
|
||||
self.clear()
|
||||
self.btest(path_from_root('tests', 'idbstore.c'), str(stage), force_c=True, args=['-lidbstore.js', '-DSTAGE=' + str(stage), '-DSECRET=\"' + secret + '\"'])
|
||||
self.btest(path_from_root('tests', 'idbstore.c'), str(stage), args=['-lidbstore.js', '-DSTAGE=' + str(stage), '-DSECRET=\"' + secret + '\"'])
|
||||
|
||||
def test_idbstore_sync(self):
|
||||
secret = str(time.time())
|
||||
self.clear()
|
||||
self.btest(path_from_root('tests', 'idbstore_sync.c'), '6', force_c=True, args=['-lidbstore.js', '-DSECRET=\"' + secret + '\"', '--memory-init-file', '1', '-O3', '-g2'] + self.get_async_args())
|
||||
self.btest(path_from_root('tests', 'idbstore_sync.c'), '6', args=['-lidbstore.js', '-DSECRET=\"' + secret + '\"', '--memory-init-file', '1', '-O3', '-g2'] + self.get_async_args())
|
||||
|
||||
def test_idbstore_sync_worker(self):
|
||||
secret = str(time.time())
|
||||
self.clear()
|
||||
self.btest(path_from_root('tests', 'idbstore_sync_worker.c'), '6', force_c=True, args=['-lidbstore.js', '-DSECRET=\"' + secret + '\"', '--memory-init-file', '1', '-O3', '-g2', '--proxy-to-worker', '-s', 'INITIAL_MEMORY=80MB'] + self.get_async_args())
|
||||
self.btest(path_from_root('tests', 'idbstore_sync_worker.c'), '6', args=['-lidbstore.js', '-DSECRET=\"' + secret + '\"', '--memory-init-file', '1', '-O3', '-g2', '--proxy-to-worker', '-s', 'INITIAL_MEMORY=80MB'] + self.get_async_args())
|
||||
|
||||
def test_force_exit(self):
|
||||
self.btest('force_exit.c', force_c=True, expected='17', args=['-s', 'EXIT_RUNTIME'])
|
||||
self.btest('force_exit.c', expected='17', args=['-s', 'EXIT_RUNTIME'])
|
||||
|
||||
def test_sdl_pumpevents(self):
|
||||
# key events should be detected using SDL_PumpEvents
|
||||
|
|
@ -3574,7 +3574,6 @@ window.close = function() {
|
|||
def test_pthread_c11_threads(self):
|
||||
self.btest(path_from_root('tests', 'pthread', 'test_pthread_c11_threads.c'),
|
||||
expected='0',
|
||||
force_c=True,
|
||||
args=['-g4', '-std=gnu11', '-xc', '-s', 'USE_PTHREADS', '-s', 'PROXY_TO_PTHREAD', '-s', 'TOTAL_MEMORY=64mb'])
|
||||
|
||||
# Test that the emscripten_ atomics api functions work.
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ class sockets(BrowserCore):
|
|||
|
||||
for harness, datagram in harnesses:
|
||||
with harness:
|
||||
self.btest('test_sockets_echo_bigdata.c', expected='0', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram], force_c=True)
|
||||
self.btest('test_sockets_echo_bigdata.c', expected='0', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram])
|
||||
|
||||
@no_windows('This test is Unix-specific.')
|
||||
def test_sockets_partial(self):
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче