update 辅助demo编译文件

Signed-off-by: Ninter515 <ry.renyi@huawei.com>

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn

@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest5") {
+ohos_hap_assist_suite("bmsAccessTokenTest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest5"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn

@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest4") {
+ohos_hap_assist_suite("bmsAccessTokenTest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest4"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn

@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest1") {
+ohos_hap_assist_suite("bmsAccessTokenTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest1"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest3") {
+ohos_hap_assist_suite("bmsAccessTokenTest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest2") {
+ohos_hap_assist_suite("bmsAccessTokenTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("first_right") {
+ohos_hap_assist_suite("first_right") {
   hap_profile = "./src/main/config.json"
   hap_name = "first_right"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest5") {
+ohos_hap_assist_suite("bmsThirdBundleTest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest5"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest1") {
+ohos_hap_assist_suite("bmsThirdBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTestA1") {
+ohos_hap_assist_suite("bmsThirdBundleTestA1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTestA1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest4") {
+ohos_hap_assist_suite("bmsThirdBundleTest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest4"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleC") {
+ohos_hap_assist_suite("bmsThirdBundleC") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleC"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleJs") {
+ohos_hap_assist_suite("bmsThirdBundleJs") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleJs"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsSystemBundleTest1") {
+ohos_hap_assist_suite("bmsSystemBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsSystemBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsSystemBundleTest2") {
+ohos_hap_assist_suite("bmsSystemBundleTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsSystemBundleTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsVendorBundleTest1") {
+ohos_hap_assist_suite("bmsVendorBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsVendorBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest2") {
+ohos_hap_assist_suite("bmsThirdBundleTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest7") {
+ohos_hap_assist_suite("bmsThirdBundleTest7") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest7"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest6") {
+ohos_hap_assist_suite("bmsThirdBundleTest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest6"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest3") {
+ohos_hap_assist_suite("bmsThirdBundleTest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsMainAbilityFirstScene") {
+ohos_hap_assist_suite("bmsMainAbilityFirstScene") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsMainAbilityFirstScene"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsMainAbilitySecondScene") {
+ohos_hap_assist_suite("bmsMainAbilitySecondScene") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsMainAbilitySecondScene"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsModuleNameTest1") {
+ohos_hap_assist_suite("bmsModuleNameTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsModuleNameTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsModuleNameTest2") {
+ohos_hap_assist_suite("bmsModuleNameTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsModuleNameTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest5") {
+ohos_hap_assist_suite("bmsJstest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest5"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest4") {
+ohos_hap_assist_suite("bmsJstest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest4"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest1") {
+ohos_hap_assist_suite("bmsJstest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest6") {
+ohos_hap_assist_suite("bmsJstest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest6"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest3") {
+ohos_hap_assist_suite("bmsJstest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest2") {
+ohos_hap_assist_suite("bmsJstest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("second_right") {
+ohos_hap_assist_suite("second_right") {
   hap_profile = "./src/main/config.json"
   hap_name = "second_right"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsStageDemo1") {
+ohos_hap_assist_suite("bmsStageDemo1") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "bmsStageDemo1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn

@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsStageDemo2") {
+ohos_hap_assist_suite("bmsStageDemo2") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "bmsStageDemo2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",