From 8637d9da3468f7a65ce42d3f33de7dd77b0be499 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 18 Nov 2021 10:23:46 -0800 Subject: [PATCH 1/3] fix --- tests/test_benchmark.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/test_benchmark.py b/tests/test_benchmark.py index 4359c9cbefa84..5f65b4440acbd 100644 --- a/tests/test_benchmark.py +++ b/tests/test_benchmark.py @@ -208,7 +208,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat '-s', 'ENVIRONMENT=node,shell', '-s', 'BENCHMARK=%d' % (1 if IGNORE_COMPILATION and not has_output_parser else 0), '-o', final - ] + shared_args + emcc_args + LLVM_FEATURE_FLAGS + self.extra_args + ] + shared_args + LLVM_FEATURE_FLAGS if common.EMTEST_FORCE64: cmd += ['--profiling'] else: @@ -217,6 +217,9 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat cmd = [arg if arg != 'FILESYSTEM=0' else 'FILESYSTEM=1' for arg in cmd] if PROFILING: cmd += ['--profiling-funcs'] + # add additional emcc args at the end, which may override other things + # above, such as minimal runtime + cmd += emcc_args + self.extra_args self.cmd = cmd run_process(cmd, env=self.env) if self.binaryen_opts: From fbe28788530fecdc33d502a4acb539fea3d7076f Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 18 Nov 2021 10:27:09 -0800 Subject: [PATCH 2/3] fix --- tests/test_benchmark.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/test_benchmark.py b/tests/test_benchmark.py index 5f65b4440acbd..149fc29c67b33 100644 --- a/tests/test_benchmark.py +++ b/tests/test_benchmark.py @@ -204,7 +204,6 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat EMCC, filename, OPTIMIZATIONS, '-s', 'INITIAL_MEMORY=256MB', - '-s', 'FILESYSTEM=0', '-s', 'ENVIRONMENT=node,shell', '-s', 'BENCHMARK=%d' % (1 if IGNORE_COMPILATION and not has_output_parser else 0), '-o', final @@ -213,13 +212,13 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat cmd += ['--profiling'] else: cmd += ['--closure=1', '-sMINIMAL_RUNTIME'] - if 'FORCE_FILESYSTEM' in cmd: - cmd = [arg if arg != 'FILESYSTEM=0' else 'FILESYSTEM=1' for arg in cmd] - if PROFILING: - cmd += ['--profiling-funcs'] # add additional emcc args at the end, which may override other things # above, such as minimal runtime cmd += emcc_args + self.extra_args + if 'FORCE_FILESYSTEM' not in cmd: + cmd = ['-s', 'FILESYSTEM=0'] + if PROFILING: + cmd += ['--profiling-funcs'] self.cmd = cmd run_process(cmd, env=self.env) if self.binaryen_opts: From 074de18fcf3ac8bfdb880591203042bd2bd0af81 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 18 Nov 2021 10:30:31 -0800 Subject: [PATCH 3/3] typo --- tests/test_benchmark.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_benchmark.py b/tests/test_benchmark.py index 149fc29c67b33..c0ac6758a9c84 100644 --- a/tests/test_benchmark.py +++ b/tests/test_benchmark.py @@ -216,7 +216,7 @@ def build(self, parent, filename, args, shared_args, emcc_args, native_args, nat # above, such as minimal runtime cmd += emcc_args + self.extra_args if 'FORCE_FILESYSTEM' not in cmd: - cmd = ['-s', 'FILESYSTEM=0'] + cmd += ['-s', 'FILESYSTEM=0'] if PROFILING: cmd += ['--profiling-funcs'] self.cmd = cmd