XTS测试套部件化修改2

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

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

@@ -56,7 +56,7 @@ 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"

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

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostE") {
+ohos_hap_assist_suite("FormSystemHostE") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostE") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostE"
   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/formsystemhostf/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostF") {
+ohos_hap_assist_suite("FormSystemHostF") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostF") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostF"
   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/formsystemhostg/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostG") {
+ohos_hap_assist_suite("FormSystemHostG") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostG") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostG"
   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/formsystemhosti/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostI") {
+ohos_hap_assist_suite("FormSystemHostI") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostI") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostI"
   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/formsystemhostj/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostJ") {
+ohos_hap_assist_suite("FormSystemHostJ") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostJ") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostJ"
   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/formsystemhostk/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostK") {
+ohos_hap_assist_suite("FormSystemHostK") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostK") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostK"
   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/formsystemhostl/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostL") {
+ohos_hap_assist_suite("FormSystemHostL") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostL") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostL"
   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/formsystemhostn/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostN") {
+ohos_hap_assist_suite("FormSystemHostN") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostN") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostN"
   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/formsystemhostnoperm/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostNoPerm") {
+ohos_hap_assist_suite("FormSystemHostNoPerm") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostNoPerm") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostNoPerm"
   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/formsystemhosto/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostO") {
+ohos_hap_assist_suite("FormSystemHostO") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostO") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostO"
   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/formsystemhostp/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemHostP") {
+ohos_hap_assist_suite("FormSystemHostP") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
@@ -23,9 +23,9 @@ ohos_hap("FormSystemHostP") {
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FormSystemHostP"
   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/formproviderst_ets/formsupplyapplicationA/BUILD.gn

@@ -13,12 +13,10 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppA") {
+ohos_hap_assist_suite("FormSupplyAppA") {
   hap_profile = "entry/src/main/config.json"
   hap_name = "FormSupplyAppA"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -26,8 +24,8 @@ ohos_hap("FormSupplyAppA") {
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 
 ohos_js_assets("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn

@@ -13,12 +13,10 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppB") {
+ohos_hap_assist_suite("FormSupplyAppB") {
   hap_profile = "entry/src/main/config.json"
   hap_name = "FormSupplyAppB"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -26,8 +24,8 @@ ohos_hap("FormSupplyAppB") {
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 
 ohos_js_assets("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/BUILD.gn

@@ -13,12 +13,10 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppC") {
+ohos_hap_assist_suite("FormSupplyAppC") {
   hap_profile = "entry/src/main/config.json"
   hap_name = "FormSupplyAppC"
   js_build_mode = "debug"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -26,8 +24,8 @@ ohos_hap("FormSupplyAppC") {
     ":FormOfFaEts_resources",
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 
 ohos_js_assets("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppD") {
+ohos_hap_assist_suite("FormSupplyAppD") {
   hap_profile = "entry/src/main/config.json"
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppD") {
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "FormSupplyAppD"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
   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("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppE") {
+ohos_hap_assist_suite("FormSupplyAppE") {
   hap_profile = "entry/src/main/config.json"
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppE") {
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "FormSupplyAppE"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
   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("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppF") {
+ohos_hap_assist_suite("FormSupplyAppF") {
   hap_profile = "entry/src/main/config.json"
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppF") {
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "FormSupplyAppF"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
   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("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppG") {
+ohos_hap_assist_suite("FormSupplyAppG") {
   hap_profile = "entry/src/main/config.json"
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppG") {
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "FormSupplyAppG"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
   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("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppH") {
+ohos_hap_assist_suite("FormSupplyAppH") {
   hap_profile = "entry/src/main/config.json"
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppH") {
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "FormSupplyAppH"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
   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("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSupplyAppNS") {
+ohos_hap_assist_suite("FormSupplyAppNS") {
   hap_profile = "entry/src/main/config.json"
   deps = [
     ":FormOfFaEts_form_js_assets",
@@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppNS") {
   ]
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "FormSupplyAppNS"
-  part_name = "prebuilt_hap"
-  subsystem_name = "applications"
   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("FormOfFaEts_js_assets") {

ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemProviderA") {
+ohos_hap_assist_suite("FormSystemProviderA") {
   hap_name = "FormSystemProviderA"
   hap_profile = "./entry/src/main/config.json"
   deps = [
@@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderA") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   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/formproviderst_ets/formsystemproviderb/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemProviderB") {
+ohos_hap_assist_suite("FormSystemProviderB") {
   hap_name = "FormSystemProviderB"
   hap_profile = "./entry/src/main/config.json"
   deps = [
@@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderB") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   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/formproviderst_ets/formsystemproviderc/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemProviderC") {
+ohos_hap_assist_suite("FormSystemProviderC") {
   hap_name = "FormSystemProviderC"
   hap_profile = "./entry/src/main/config.json"
   deps = [
@@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderC") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   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/formproviderst_ets/formsystemproviderd/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("FormSystemProviderD") {
+ohos_hap_assist_suite("FormSystemProviderD") {
   hap_name = "FormSystemProviderD"
   hap_profile = "./entry/src/main/config.json"
   deps = [
@@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderD") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   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/formsystemtest_ets/formacquiretest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormAcquireTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormAcquireTest"
+  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/formsystemtest_ets/formacquiretest2/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormAcquire2Test") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormAcquire2Test"
+  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/formsystemtest_ets/formdeletetest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormDeleteTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormDeleteTest"
+  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/formsystemtest_ets/formdynamicrefreshtest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormDynamicRefreshTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormDynamicRefreshTest"
+  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/formsystemtest_ets/formfuzztest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormFuzzTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormFuzzTest"
+  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/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsOneAndOneTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormsOneAndOneTest"
+  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/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsOneAndTwoTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormsOneAndTwoTest"
+  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/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsOneAndZeroTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormsOneAndZeroTest"
+  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/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsWithoutPermTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormsWithoutPermTest"
+  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/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsZeroTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormsZeroTest"
+  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/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormHostDeathRecipientTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormHostDeathRecipientTest"
+  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/formsystemtest_ets/formperformancetest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormPerformanceTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormPerformanceTest"
+  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/formsystemtest_ets/formreleasetest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormReleaseTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormReleaseTest"
+  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/formsystemtest_ets/formstatetest_disable/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateDisableTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormStateDisableTest"
+  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/formsystemtest_ets/formstatetest_enable/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateEnableTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormStateEnableTest"
+  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/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateNotifyInvisibleTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormStateNotifyInvisibleTest"
+  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/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateNotifyInvisible2Test") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormStateNotifyInvisible2Test"
+  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/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateNotifyVisibleTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormStateNotifyVisibleTest"
+  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/formsystemtest_ets/formstresstest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStressTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormStressTest"
+  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/formsystemtest_ets/formupdatefreshtest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormUpdateRefreshTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFormUpdateRefreshTest"
+  subsystem_name = "ability"
+  part_name = "form_fwk"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn

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

ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn

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

ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn

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

ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn

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

ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn

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

ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsLifecycleMultiHap3") {
+ohos_hap_assist_suite("ActsLifecycleMultiHap3") {
   hap_name = "ActsLifecycleMultiHap3"
   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 = [
     ":actslifecyclemultihap3_js_assets",
@@ -27,6 +25,9 @@ ohos_hap("ActsLifecycleMultiHap3") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actslifecyclemultihap3_app_profile") {

ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn

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

ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/BUILD.gn

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

ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/BUILD.gn

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

ability/ability_runtime/want/actsgetwantalltest/BUILD.gn

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

ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn

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

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

ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn

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

ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsAmsZidlServiceRelyHap") {
+ohos_hap_assist_suite("ActsAmsZidlServiceRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,10 +23,10 @@ ohos_hap("ActsAmsZidlServiceRelyHap") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAmsZidlServiceRelyHap"
-  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("actsamszidlservicerelyhap_app_profile") {