XTS测试套部件化修改

Signed-off-by: Nchengxingzhen <chengxingzhen@huawei.com>

ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackFifthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackFifthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackFirstSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackFirstSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackFourthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackFourthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackSecondSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackSecondSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsCallBackThirdSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsCallBackThirdSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn

@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestFifthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestFifthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn

@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestFirstSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestFirstSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsAmsTestFourthSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestFourthSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn

@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestSecondSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestSecondSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn

@@ -20,6 +20,9 @@ ohos_js_hap_suite("ActsAmsTestThirdSceneTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsTestThirdSceneTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("simulateEAbility") {
+ohos_hap_assist_suite("simulateEAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "simulateEAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("simulateFAbilityFir") {
+ohos_hap_assist_suite("simulateFAbilityFir") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "simulateFAbilityFir"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("simulateFAbilitySed") {
+ohos_hap_assist_suite("simulateFAbilitySed") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "simulateFAbilitySed"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("verifyAAbility") {
+ohos_hap_assist_suite("verifyAAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "verifyAAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("verifyIAbility") {
+ohos_hap_assist_suite("verifyIAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "verifyIAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapARelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapa_app_profile") {

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapBRelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapBRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapb_app_profile") {

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapCRelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapCRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapCRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapCRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapc_app_profile") {

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapDRelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapDRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsAbilityMultiinstanceHapDRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceHapDRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstancehapd_app_profile") {

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn

@@ -12,19 +12,19 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsAbilityMultiinstanceHapERelyHap") {
+ohos_hap_assist_suite("ActsAmsAbilityMultiinstanceHapERelyHap") {
   hap_name = "ActsAmsAbilityMultiinstanceHapERelyHap"
   js_build_mode = "debug"
   hap_profile = "./src/main/config.json"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsAbilityMultiinstanceTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsAbilityMultiinstanceTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsabilitymultiinstance_app_profile") {

ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAbilityDelegatorCaseTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAbilityDelegatorCaseTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

ability/ability_runtime/actsabilitymanageretstest/BUILD.gn

@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAbilityManagerEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAbilityManagerEtsTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/actsabilityusertest/BUILD.gn

@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAbilityuserTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAbilityuserTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsabilityusertest_app_profile") {

ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCalleeARelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCalleeARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,9 @@ ohos_hap("ActsSystemAppCalleeARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCalleeARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcalleea_app_profile") {

ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCallerARelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCallerARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsSystemAppCallerARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCallerARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcallera_app_profile") {

ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCallerBRelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCallerBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsSystemAppCallerBRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCallerBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcallerb_app_profile") {

ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsSystemAppCallerCRelyHap") {
+ohos_hap_assist_suite("ActsSystemAppCallerCRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsSystemAppCallerCRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsSystemAppCallerCRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemappcallerc_app_profile") {

ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsCallTestEntryTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsCallTestEntryTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemcallentrytest_app_profile") {

ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsCallTestFeatureRelyHap") {
+ohos_hap_assist_suite("ActsCallTestFeatureRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsCallTestFeatureRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsCallTestFeatureRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("systemcallfeature_app_profile") {

ability/ability_runtime/actscalltest/thirdappa/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsThirdAppARelyHap") {
+ohos_hap_assist_suite("ActsThirdAppARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsThirdAppARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsThirdAppARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("thirdappa_app_profile") {

ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsThirdCallTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsThirdCallTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("thirdcalltest_app_profile") {

ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn

@@ -13,19 +13,19 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersApi7AppA") {
+ohos_hap_assist_suite("ActsAmsUsersApi7AppA") {
   hap_name = "ActsAmsUsersApi7AppA"
   js_build_mode = "debug"
   hap_profile = "entry/src/main/config.json"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsusersapi7appa_resources",
     ":actsamsusersapi7appa_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("actsamsusersapi7appa_ts_assets") {

ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersKillProcessAppA") {
+ohos_hap_assist_suite("ActsAmsUsersKillProcessAppA") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsUsersKillProcessAppA"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsuserskillprocessappa_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsUsersKillProcessAppA") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserskillprocessappa_app_profile") {

ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersKillProcessAppB") {
+ohos_hap_assist_suite("ActsAmsUsersKillProcessAppB") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsUsersKillProcessAppB"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsuserskillprocessappb_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsUsersKillProcessAppB") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserskillprocessappb_app_profile") {

ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsUsersKillProcessAppC") {
+ohos_hap_assist_suite("ActsAmsUsersKillProcessAppC") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsUsersKillProcessAppC"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsuserskillprocessappc_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsUsersKillProcessAppC") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserskillprocessappc_app_profile") {

ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsUsersSystemTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsUsersSystemTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsuserssystemtest_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsExtensionModuleRelyHap") {
+ohos_hap_assist_suite("ActsAmsExtensionModuleRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsExtensionModuleRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsextensionmodulerelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsExtensionModuleRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsextensionmodulerelyhap_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticAbilityStageContextTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticAbilityStageContextTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticabilitystagecontexttest_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticExtensionInfoRelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticExtensionInfoRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticExtensionInfoRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticextensioninforelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticExtensionInfoRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticextensioninforelyhap_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticExtensionInfoTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticExtensionInfoTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticextensiontnfotest_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticARelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticarelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticARelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticarelyhap_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticBRelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticbrelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticBRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticbrelyhap_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticInfoMationQueryTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticInfoMationQueryTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticinfomationquerytest_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticInformationMultipleTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticInformationMultipleTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticinformationmultipletest_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsStaticInformationMultiTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStaticInformationMultiTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticinformationmultitest_app_profile") {

ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsStaticQueryTestTwoRelyHap") {
+ohos_hap_assist_suite("ActsAmsStaticQueryTestTwoRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsStaticQueryTestTwoRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsamsstaticquerytesttworelyhap_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("ActsAmsStaticQueryTestTwoRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstaticquerytesttworelyhap_app_profile") {

ability/ability_runtime/amsdatauriutils/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAmsDataUriUtilsTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAmsDataUriUtilsTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsSpecifyTestRelyHap") {
+ohos_hap_assist_suite("ActsAmsSpecifyTestRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,11 @@ ohos_hap("ActsAmsSpecifyTestRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsSpecifyTestRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsspecifytestrelyhap_app_profile") {

ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn

@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsStartAbilityTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStartAbilityTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstartabilitytest_app_profile") {

ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsAbilityRunningInfosTest") {
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsApiCoverhapTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsApiCoverhapTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("apicoverhaptest_app_profile") {

ability/ability_runtime/apicover/fasupplement/BUILD.gn

@@ -13,18 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FaSupplement") {
+ohos_hap_assist_suite("FaSupplement") {
   hap_profile = "entry/src/main/config.json"
   hap_name = "FaSupplement"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":fasupplement_resources",
     ":fasupplement_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("fasupplement_ts_assets") {

ability/ability_runtime/apicover/formmodule/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormModule") {
+ohos_hap_assist_suite("FormModule") {
   hap_name = "FormModule"
   js_build_mode = "debug"
   hap_profile = "entry/src/main/module.json"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":formmodule_js_assets",
@@ -27,6 +25,8 @@ ohos_hap("FormModule") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("formmodule_app_profile") {

ability/ability_runtime/apicover/stagesupplement/BUILD.gn

@@ -13,12 +13,10 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("StageSupplement") {
+ohos_hap_assist_suite("StageSupplement") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "StageSupplement"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":stagesupplement_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("StageSupplement") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("stagesupplement_app_profile") {

ability/ability_runtime/context/actscontexttest/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsContextTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsContextTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/context/scene/defpermission/BUILD.gn

@@ -12,19 +12,19 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("DefPermission") {
+ohos_hap_assist_suite("DefPermission") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "DefPermission"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

ability/ability_runtime/fa/faapplicationinfo/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsApplicationinfoTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsApplicationinfoTest"
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsConfigurationconstantTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsConfiGurationConstantTest"
+  subsystem_name = "ability"
+  part_name = "ability_base"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/fa/facoverapi/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsCoverapiTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsCoverApiTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsEqueryabilitybywantTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsEqueryabilitybywantTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

ability/ability_runtime/formmanager/BUILD.gn

@@ -18,7 +18,7 @@ group("formmanager") {
   if (is_standard_system) {
     deps = [
       "fa:formmanager",
-      #"stage:stage",
+      "stage:stage",
     ]
   }
 }

ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn

@@ -13,19 +13,20 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantApi7RelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantApi7RelyHap") {
   hap_profile = "./entry/src/main/config.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantApi7RelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantARelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsnewwantarelyhap_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantARelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwantarelyhap_app_profile") {

ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantBRelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsnewwantbrelyhap_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantBRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwantbrelyhap_app_profile") {

ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsNewWantRelyHap") {
+ohos_hap_assist_suite("ActsAmsNewWantRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsAmsNewWantRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsnewwantrelyhap_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwantrelyhap_app_profile") {

ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn

@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsNewWantTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsNewWantTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsnewwanttest_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapAARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapAARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapaarelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapABRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapABRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapabrelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbarelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbbrelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBCRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBCRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbcrelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBDRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBDRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbdrelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBERelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBERelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapberelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") {
+ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBFRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceHapBFRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstancehapbfrelyhap_app_profile") {

ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsProcessMultiinstanceTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsprocessmultiinstance_app_profile") {