diff --git a/test/runner.py b/test/runner.py index c0e04a08c99c4fb94efd9dd33f24d68b157a2897..2c1a05b250c5f98a5453a6fbc07b2f4515cb0d13 100755 --- a/test/runner.py +++ b/test/runner.py @@ -101,9 +101,6 @@ def get_args(): parser.add_argument( '--jit', action='store_true', dest='jit', default=False, help='use JIT in interpreter') - parser.add_argument( - '--arm64-compiler-skip', action='store_true', dest='arm64_compiler_skip', default=False, - help='use skiplist for tests failing on aarch64 in AOT or JIT mode') parser.add_argument( '--arm64-qemu', action='store_true', dest='arm64_qemu', default=False, help='launch all binaries in qemu aarch64') @@ -133,8 +130,11 @@ class Test: self.skipped = None self.reproduce = "" - def log_cmd(self, cmd): - self.reproduce += "\n" + ' '.join(cmd) + def log_cmd(self, cmd, verbose=False): + cmd_str = ' '.join(cmd) + self.reproduce += "\n" + cmd_str + if verbose: + print(cmd_str, file=sys.stderr) def run(self, runner): cmd = runner.cmd_prefix + [runner.es2panda, "--dump-ast"] @@ -202,11 +202,7 @@ class Test262Test(Test): cmd.append(self.path) - self.log_cmd(cmd) - - if runner.args.verbose: - print('Run es2panda: %s' % ' '.join(cmd), file=sys.stderr) - + self.log_cmd(cmd, runner.args.verbose) process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=runner.cmd_env) @@ -235,19 +231,13 @@ class Test262Test(Test): return self if runner.args.aot: - cmd = runner.cmd_prefix + [runner.arkaot] - cmd.extend(runner.aot_args) - cmd.extend(['--paoc-panda-files', test_abc]) - cmd.extend(['--paoc-output', test_an]) + cmd = runner.cmd_prefix + [runner.arkaot] + runner.aot_args + cmd.extend(['--paoc-panda-files', test_abc, '--paoc-output', test_an]) if os.path.isfile(test_an): os.remove(test_an) - self.log_cmd(cmd) - - if runner.args.verbose: - print('Run ark_aot: %s' % ' '.join(cmd), file=sys.stderr) - + self.log_cmd(cmd, runner.args.verbose) process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=runner.cmd_env) @@ -266,12 +256,7 @@ class Test262Test(Test): self.error = err.decode("utf-8", errors="ignore") return self - cmd = runner.cmd_prefix + [runner.runtime] - - if runner.args.verbose: - print('Run aot for arm64: %s' % ' '.join(cmd), file=sys.stderr) - - cmd.extend(runner.runtime_args) + cmd = runner.cmd_prefix + [runner.runtime] + runner.runtime_args if runner.args.aot: cmd.extend(['--aot-files', test_an]) @@ -283,11 +268,7 @@ class Test262Test(Test): cmd.extend([test_abc, "_GLOBAL::func_main_0"]) - self.log_cmd(cmd) - - if runner.args.verbose: - print('Run ark: %s' % ' '.join(cmd), file=sys.stderr) - + self.log_cmd(cmd, runner.args.verbose) process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=runner.cmd_env) @@ -522,8 +503,6 @@ class Test262Runner(Runner): if args.bco: self.skiplist_bco_name = "test262skiplist-bco.txt" - if args.arm64_compiler_skip: - self.skiplist_name_list.append("test262skiplist-compiler-arm64.txt") self.tmp_dir = path.join(path.sep, 'tmp', 'panda', 'test262') os.makedirs(self.tmp_dir, exist_ok=True) diff --git a/test/test262skiplist-compiler-arm64.txt b/test/test262skiplist-compiler-arm64.txt deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000