!6515 xts-BUILD.gn文件整改

Merge pull request !6515 from chengxingzhen/master

ability/ability_runtime/aacommand/AACommand07/Test.json

-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.aacommand07",
-        "module-name": "entry_test",
-        "shell-timeout": "600000"
-    }
-}
-

ability/ability_runtime/aacommand/AACommand08/Test.json

-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.aacommand08",
-        "module-name": "entry_test",
-        "shell-timeout": "600000"
-    }
-}
-

ability/ability_runtime/aacommand/AACommandPrintSync/Test.json

-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.aacommandprintsync",
-        "module-name": "entry_test_desc",
-        "shell-timeout": "600000"
-    }
-}
-

ability/ability_runtime/aacommand/AACommandRelyHap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}
-

ability/ability_runtime/aacommand/AACommandpackage/Test.json

-{
-    "description": "Configuration for aceceshi Tests",
-    "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "600000",
-        "bundle-name": "com.example.actsaacommandtestatest",
-        "module-name": "entry_test",
-        "shell-timeout": "600000"
-    }
-}
-

ability/ability_runtime/faapicover/faauxiliary/BUILD.gn

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

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

@@ -12,19 +12,18 @@
 # 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,18 @@
 # 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,18 @@
 # 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,18 @@
 # 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,18 @@
 # 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,18 @@
 # 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,18 @@
 # 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"