From 74ffb12343bb88ffee226a7dfa12ea0cdc7b070e Mon Sep 17 00:00:00 2001
From: lhc <liuhongchen5@huawei.com>
Date: Thu, 31 Jul 2025 11:53:35 +0800
Subject: [PATCH] Modify cmc ut of xml

Issue: https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/ICQ134?from=project-issue

Signed-off-by: lhc <liuhongchen5@huawei.com>
Change-Id: I6969da363de32532fc3afad24df76d940f52b2d5
---
 common_components/tests/ohos_test.xml   | 216 ------------------------
 common_components/tests/test_helper.gni |   2 +-
 test/resource/js_runtime/ohos_test.xml  | 215 +++++++++++++++++++++++
 3 files changed, 216 insertions(+), 217 deletions(-)
 delete mode 100644 common_components/tests/ohos_test.xml

diff --git a/common_components/tests/ohos_test.xml b/common_components/tests/ohos_test.xml
deleted file mode 100644
index 50848caed7..0000000000
--- a/common_components/tests/ohos_test.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2025 Huawei Device Co., Ltd.
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration ver="2.0">
-    <target name="Allocator_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Base_Runtime_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Base_String_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Collector_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Finalizer_Processor_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Common_Profiler_Interface_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="C_String_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Collector_Proxy_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="From_Space_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Mutator_Manager_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Mutator_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Region_Manager_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Satb_Buffer_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Thread_Holder_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Trace_Collector_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Copy_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Enum_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Idle_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Post_Trace_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Preforward_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Remark_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Trace_Barrier_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="W_Collector_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Page_Cache_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Treap_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Gc_Request_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Task_Queue_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Log_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Map_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Runner_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Taskpool_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Thread_Local_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Composite_Base_Class_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Verification_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Heap_Manager_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Base_String_Table_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Mem_Utils_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Utf_Helper_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-    <target name="Heuristic_Gc_Policy_Test">
-        <preparer>
-            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
-        </preparer>
-    </target>
-</configuration>
\ No newline at end of file
diff --git a/common_components/tests/test_helper.gni b/common_components/tests/test_helper.gni
index 6b97cb62de..b5f9676f18 100644
--- a/common_components/tests/test_helper.gni
+++ b/common_components/tests/test_helper.gni
@@ -40,7 +40,7 @@ template("host_unittest_action") {
   # unittest for phone running
   ohos_unittest(_target_name_) {
     resource_config_file =
-        "//arkcompiler/ets_runtime/common_components/tests/ohos_test.xml"
+        "//arkcompiler/ets_runtime/test/resource/js_runtime/ohos_test.xml"
     forward_variables_from(invoker, "*")
   }
 
diff --git a/test/resource/js_runtime/ohos_test.xml b/test/resource/js_runtime/ohos_test.xml
index 5479c701df..5b210d48ac 100755
--- a/test/resource/js_runtime/ohos_test.xml
+++ b/test/resource/js_runtime/ohos_test.xml
@@ -3803,4 +3803,219 @@
             <option name="push" value="arkcompiler/ets_runtime/libark_jsruntime_test.so -> /data/test" src="out"/>
         </preparer>
     </target>
+<target name="Allocator_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Base_Runtime_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Base_String_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Collector_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Finalizer_Processor_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="C_String_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Collector_Proxy_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="From_Space_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Mutator_Manager_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Mutator_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Region_Manager_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Satb_Buffer_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Thread_Holder_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Trace_Collector_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Copy_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Enum_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Idle_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Post_Trace_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Preforward_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Remark_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Trace_Barrier_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="W_Collector_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Page_Cache_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Treap_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Gc_Request_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Task_Queue_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Log_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Map_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Runner_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Taskpool_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Thread_Local_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Composite_Base_Class_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Verification_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Heap_Manager_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Base_String_Table_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Mem_Utils_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Utf_Helper_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Heuristic_Gc_Policy_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Serialize_Utils_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Taskpool_Task_Queue_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Region_Space_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
+    <target name="Heap_Allocator_Test">
+        <preparer>
+            <option name="push" value="arkcompiler/ets_runtime/libark_common_components_test.so -> /data/test" src="out"/>
+        </preparer>
+    </target>
 </configuration>
-- 
Gitee