!4841 【XTS】【元能力】部分测试套部件化修改

Merge pull request !4841 from chengxingzhen/master

ability/ability_runtime/aacommand/AACommand07/BUILD.gn

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

ability/ability_runtime/aacommand/AACommand08/BUILD.gn

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

ability/ability_runtime/aacommand/AACommandPrintSync/BUILD.gn

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

ability/ability_runtime/aacommand/AACommandPrintSyncTest/BUILD.gn

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

ability/ability_runtime/aacommand/AACommandRelyHap/BUILD.gn

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

ability/ability_runtime/aacommand/AACommandpackage/BUILD.gn

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

ability/ability_runtime/aacommand/AACommandtest/BUILD.gn

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

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/abilitymontior/BUILD.gn

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

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/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn

@@ -13,19 +13,20 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsDataAbilityRelyHap") {
+ohos_hap_assist_suite("ActsDataAbilityRelyHap") {
   hap_name = "ActsDataAbilityRelyHap"
   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 = [
     ":dataability_resources",
     ":dataability_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("dataability_ts_assets") {

ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/BUILD.gn

@@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsFWKDataAccessorTest") {
     ":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/actsqueryfunctiontest/actsgetabilitystatestagetest/BUILD.gn

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

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/BUILD.gn

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

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/BUILD.gn

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

ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/BUILD.gn

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

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/BUILD.gn

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

ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/BUILD.gn

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

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/BUILD.gn

@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsServiceAbilityClientTest") {
     ":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/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn

@@ -13,19 +13,19 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsServiceAbilityServerRelyHap") {
+ohos_hap_assist_suite("ActsServiceAbilityServerRelyHap") {
   hap_name = "ActsServiceAbilityServerRelyHap"
   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 = [
     ":serviceability_resources",
     ":serviceability_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("serviceability_ts_assets") {

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn

@@ -13,19 +13,19 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsServiceAbilityServerSecondRelyHap") {
+ohos_hap_assist_suite("ActsServiceAbilityServerSecondRelyHap") {
   hap_name = "ActsServiceAbilityServerSecondRelyHap"
   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 = [
     ":serviceability_resources",
     ":serviceability_ts_assets",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_js_assets("serviceability_ts_assets") {

ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/BUILD.gn

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

ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/BUILD.gn

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

ability/ability_runtime/actsstartrunnertest/BUILD.gn

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

ability/ability_runtime/actsstserviceabilityclientcase/BUILD.gn

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

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/actsamsstartabilityforresulttest/BUILD.gn

@@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsStartAbilityForResultTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsStartAbilityForResultTest"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsamsstartabilityforresulttest_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/apitest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsApiTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsApiTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("testapi_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/featureability/actsfeatureabilitytest/BUILD.gn

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

ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FinishWithResultEmptyTest") {
+ohos_hap_assist_suite("FinishWithResultEmptyTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "FinishWithResultEmptyTest"
-  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/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FinishWithResultPromiseParametersTest") {
+ohos_hap_assist_suite("FinishWithResultPromiseParametersTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "FinishWithResultPromiseParametersTest"
-  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/featureability/sceneproject/finishwithresulttest/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FinishWithResultTest") {
+ohos_hap_assist_suite("FinishWithResultTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "FinishWithResultTest"
-  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/featureability/sceneproject/getcallingbundletest/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("GetCallingBundlePromiseTest") {
+ohos_hap_assist_suite("GetCallingBundlePromiseTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "GetCallingBundlePromiseTest"
-  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/featureability/sceneproject/startability/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("StartAbility") {
+ohos_hap_assist_suite("StartAbility") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "StartAbility"
-  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/featureability/sceneproject/startabilityforresult/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("StartAbilityForResult") {
+ohos_hap_assist_suite("StartAbilityForResult") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "StartAbilityForResult"
-  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/featureability/sceneproject/terminateabilitytest/BUILD.gn

@@ -12,19 +12,20 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("TerminateAbilityTest") {
+ohos_hap_assist_suite("TerminateAbilityTest") {
   hap_profile = "./src/main/config.json"
   js_build_mode = "debug"
   hap_name = "TerminateAbilityTest"
-  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/formmanager/BUILD.gn

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

ability/ability_runtime/formmanager/fa/BUILD.gn

@@ -56,7 +56,8 @@ group("formmanager") {
       "formsystemtest_ets/formgetformsinfotest/formswithoutpermtest:ActsFormsWithoutPermTest",
       "formsystemtest_ets/formgetformsinfotest/formszerotest:ActsFormsZeroTest",
       "formsystemtest_ets/formhostdeathrecipienttest:ActsFormHostDeathRecipientTest",
-      "formsystemtest_ets/formperformancetest:ActsFormPerformanceTest",
+
+      #"formsystemtest_ets/formperformancetest:ActsFormPerformanceTest",
       "formsystemtest_ets/formreleasetest:ActsFormReleaseTest",
       "formsystemtest_ets/formstatetest_disable:ActsFormStateDisableTest",
       "formsystemtest_ets/formstatetest_enable:ActsFormStateEnableTest",

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHost") {
+ohos_hap_assist_suite("FormSystemHost") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHost") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHost"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostB") {
+ohos_hap_assist_suite("FormSystemHostB") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostB") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostB"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostC") {
+ohos_hap_assist_suite("FormSystemHostC") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostC") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostC"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostD") {
+ohos_hap_assist_suite("FormSystemHostD") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostD") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostD"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"