From 81c3f0fc3ef039f933f5f7b542edd4dadbadf630 Mon Sep 17 00:00:00 2001 From: Viktoria Shirunova Date: Tue, 3 Sep 2024 17:38:23 +0300 Subject: [PATCH 1/2] test262: support --test-list Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/IAP8X7 Testing: All required pre-merge tests passed. Results are available in the ggwatcher. Signed-off-by: Viktoria Shirunova Change-Id: I350551b5583dd5013818026ebc59ae502fb2ff12 --- build/compile_script/ark.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index b3372939..e17b8acb 100755 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -506,6 +506,11 @@ class ArkPy: if threads_value: args_to_test262_cmd.extend([threads_name, threads_value]) + test_list_name = "--test-list" + test_list_value, arg_list = ArkPy.parse_option(arg_list, option_name=test_list_name, default_value=None) + if test_list_value is not None: + args_to_test262_cmd.extend([test_list_name, test_list_value]) + enable_rm = [arg for arg in arg_list if "enable-rm" in arg] if enable_rm: args_to_test262_cmd.append("--enable-rm") @@ -708,7 +713,7 @@ class ArkPy: "[none or --pgo] [none or --litecg] [none, file or dir] [none or --threads=X] [option]\033[0m\n" " python3 ark.py \033[92m[os_cpu].[mode] [test262] [none or --jit] [none or --threads=X]\033[0m\n" " python3 ark.py \033[92m[os_cpu].[mode] [test262] [none or --baseline-jit] [none or --enable-rm] " \ - "[none or --threads=X]\033[0m\n" + "[none or --threads=X and/or --test-list TEST_LIST_NAME]\033[0m\n" " python3 ark.py \033[92m[os_cpu].[mode] [unittest] [option]\033[0m\n" " python3 ark.py \033[92m[os_cpu].[mode] [regresstest] [none, file or dir] " \ "[none or --processes X and/or --test-list TEST_LIST_NAME]\033[0m\n") -- Gitee From 774edc2db97f28616405b03c7a8197984195eafa Mon Sep 17 00:00:00 2001 From: Viktoria Shirunova Date: Wed, 11 Sep 2024 17:51:52 +0300 Subject: [PATCH 2/2] regresstest: fix qemu Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/IAQOD2 Testing: All required pre-merge tests passed. Results are available in the ggwatcher. Signed-off-by: Viktoria Shirunova Change-Id: Ic48c4cd5314de10fe47bdbfe2286378d6a6be5ed --- build/compile_script/ark.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/compile_script/ark.py b/build/compile_script/ark.py index e17b8acb..576f6dfd 100755 --- a/build/compile_script/ark.py +++ b/build/compile_script/ark.py @@ -341,7 +341,8 @@ class ArkPy: is_arm = any('target_cpu="arm64"' in arg for arg in gn_args) if is_arm: cmd.append("--ark-arch aarch64") - cmd.append(f"--ark-arch-root=../../{out_path}/common/common/libc/") + if test_suite == "test262": + cmd.append(f"--ark-arch-root=../../{out_path}/common/common/libc/") cmd.append(f"--ark-frontend-binary=../../{x64_out_path}/arkcompiler/ets_frontend/es2abc") cmd.append(f"--merge-abc-binary=../../{x64_out_path}/arkcompiler/ets_frontend/merge_abc") if aot_mode: -- Gitee