From 27eadbbeb8f483587f33c1ce7b319526e9b574ed Mon Sep 17 00:00:00 2001 From: Elizaveta Kozhevnikova Date: Fri, 5 Sep 2025 15:36:35 +0300 Subject: [PATCH] URunner2: fix cmd to run ark step Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICWNVI Testing: All required pre-merge tests passed. Results are available in the ggwatcher. Signed-off-by: Elizaveta Kozhevnikova --- .../tests-u-runner-2/runner/suites/test_standard_flow.py | 5 ++--- .../runner/test/launches_test/options_test.py | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py b/static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py index 068e73086e..99be527d38 100644 --- a/static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py +++ b/static_core/tests/tests-u-runner-2/runner/suites/test_standard_flow.py @@ -265,9 +265,8 @@ class TestStandardFlow(Test): return step new_step = copy.copy(step) new_step.args = step.args[:] - if self.dependent_tests: - new_step.args = self.__add_boot_panda_files(new_step.args) - return new_step + # enable verifier + new_step.args.insert(-2, "--verification-mode=ahead-of-time") new_step.args.insert(-2, self.__add_panda_files()) return new_step diff --git a/static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py b/static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py index 7a1dc8b64b..cf501c9c83 100644 --- a/static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py +++ b/static_core/tests/tests-u-runner-2/runner/test/launches_test/options_test.py @@ -103,6 +103,11 @@ class OptionsTest(TestCase): self.assertEqual(len(parts), 1 + len(checked)) self.assertTrue(all(self.compare_list(parts[1:], checked))) + def check_boot_panda_files_ark(self, arg: str) -> None: + parts = arg.split(":") + self.assertEqual(len(parts), 1) + self.assertTrue('stdlib' in parts[0]) + @patch('runner.utils.get_config_workflow_folder', lambda: OptionsTest.data_folder) @patch('runner.utils.get_config_test_suite_folder', lambda: OptionsTest.data_folder) @patch('sys.argv', ["runner.sh", "panda", "test_suite1"]) @@ -240,9 +245,7 @@ class OptionsTest(TestCase): boot_panda_files = arg[0] \ if len(arg := [arg for arg in new_step.args if arg.startswith("--boot-panda-files=")]) > 0 \ else "" - self.check_boot_panda_files( - ['intermediate/test2_dependent_test2.ets.abc', 'intermediate/test2.ets.abc'], - boot_panda_files) + self.check_boot_panda_files_ark(boot_panda_files) # clear up shutil.rmtree(work_dir.root, ignore_errors=True) -- Gitee