From a7e31e8be0af89be9dc6e0bd3e919b847fe69e8f Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Fri, 5 Aug 2022 11:41:30 +0800 Subject: [PATCH] =?UTF-8?q?XTS=E6=B5=8B=E8=AF=95=E5=A5=97=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- .../abilitymanager/actsamscallbackfifthscene/BUILD.gn | 3 +++ .../abilitymanager/actsamscallbackfirstscene/BUILD.gn | 3 +++ .../abilitymanager/actsamscallbackfourthscene/BUILD.gn | 3 +++ .../abilitymanager/actsamscallbacksecondscene/BUILD.gn | 3 +++ .../abilitymanager/actsamscallbackthirdscene/BUILD.gn | 3 +++ .../abilitymanager/actsamstestfifthscene/BUILD.gn | 3 +++ .../abilitymanager/actsamstestfirstscene/BUILD.gn | 3 +++ .../abilitymanager/actsamstestfourthscene/BUILD.gn | 3 +++ .../abilitymanager/actsamstestsecondscene/BUILD.gn | 3 +++ .../abilitymanager/actsamstestthirdscene/BUILD.gn | 3 +++ .../sceneProject/simulateEAbility/BUILD.gn | 9 +++++---- .../sceneProject/simulateFAbilityFir/BUILD.gn | 9 +++++---- .../sceneProject/simulateFAbilitySed/BUILD.gn | 9 +++++---- .../abilitymanager/sceneProject/verifyAAbility/BUILD.gn | 9 +++++---- .../abilitymanager/sceneProject/verifyIAbility/BUILD.gn | 9 +++++---- .../amsabilitymultiinstanceappa/BUILD.gn | 8 ++++---- .../amsabilitymultiinstanceappb/BUILD.gn | 8 ++++---- .../amsabilitymultiinstanceappc/BUILD.gn | 8 ++++---- .../amsabilitymultiinstanceappd/BUILD.gn | 8 ++++---- .../amsabilitymultiinstanceappe/BUILD.gn | 8 ++++---- .../amsabilitymultiinstancetest/BUILD.gn | 2 ++ .../ability_runtime/actsabilitydelegatorcase/BUILD.gn | 2 ++ .../ability_runtime/actsabilitymanageretstest/BUILD.gn | 3 +++ ability/ability_runtime/actsabilityusertest/BUILD.gn | 3 +++ .../actscalltest/systemappcalleea/BUILD.gn | 7 +++---- .../actscalltest/systemappcallera/BUILD.gn | 8 ++++---- .../actscalltest/systemappcallerb/BUILD.gn | 8 ++++---- .../actscalltest/systemappcallerc/BUILD.gn | 8 ++++---- .../actscalltest/systemcallentrytest/BUILD.gn | 2 ++ .../actscalltest/systemcallfeature/BUILD.gn | 8 ++++---- ability/ability_runtime/actscalltest/thirdappa/BUILD.gn | 8 ++++---- .../ability_runtime/actscalltest/thirdcalltest/BUILD.gn | 2 ++ .../actsusers/ActsAmsUsersApi7AppA/BUILD.gn | 8 ++++---- .../actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn | 8 ++++---- .../actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn | 8 ++++---- .../actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn | 8 ++++---- .../actsusers/ActsAmsUsersSystemTest/BUILD.gn | 2 ++ .../actsamsextensionmodulehap/BUILD.gn | 8 ++++---- .../actsamsstaticabilitystagecontexttest/BUILD.gn | 2 ++ .../actsamsstaticextensioninfohap/BUILD.gn | 8 ++++---- .../actsamsstaticextensioninfotest/BUILD.gn | 2 ++ .../amscontextualinforquery/actsamsstatichapa/BUILD.gn | 8 ++++---- .../amscontextualinforquery/actsamsstatichapb/BUILD.gn | 8 ++++---- .../actsamsstaticinfomationquerytest/BUILD.gn | 2 ++ .../actsamsstaticinformationmultipletest/BUILD.gn | 2 ++ .../actsamsstaticinformationmultitest/BUILD.gn | 2 ++ .../actsamsstaticquerytesttwohap/BUILD.gn | 8 ++++---- ability/ability_runtime/amsdatauriutils/BUILD.gn | 2 ++ .../amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn | 9 +++++---- .../amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn | 3 +++ .../actsgetabilityprocessinfotest/BUILD.gn | 2 ++ .../ability_runtime/apicover/apicoverhaptest/BUILD.gn | 2 ++ ability/ability_runtime/apicover/fasupplement/BUILD.gn | 8 ++++---- ability/ability_runtime/apicover/formmodule/BUILD.gn | 8 ++++---- .../ability_runtime/apicover/stagesupplement/BUILD.gn | 8 ++++---- ability/ability_runtime/context/actscontexttest/BUILD.gn | 2 ++ .../ability_runtime/context/scene/defpermission/BUILD.gn | 8 ++++---- ability/ability_runtime/fa/faapplicationinfo/BUILD.gn | 2 ++ .../ability_runtime/fa/faconfigurationconstant/BUILD.gn | 2 ++ ability/ability_runtime/fa/facoverapi/BUILD.gn | 2 ++ .../ability_runtime/fa/faequeryabilitybywant/BUILD.gn | 2 ++ ability/ability_runtime/formmanager/BUILD.gn | 2 +- .../newwant/actsnewwantapi7relyhap/BUILD.gn | 9 +++++---- .../ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn | 9 +++++---- .../ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn | 9 +++++---- .../ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn | 9 +++++---- ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn | 3 +++ .../actsamsprocessmultiinstancehapaarelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapabrelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapbarelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapberelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn | 8 ++++---- .../actsamsprocessmultiinstancetest/BUILD.gn | 2 ++ 76 files changed, 258 insertions(+), 169 deletions(-) diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn index 391e1a958..933072fb5 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn index ecd15d7bf..0de865777 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfirstscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn index 4c5403204..ed428847e 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackfourthscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn index fc0823c56..000385347 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbacksecondscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn index 79b9a0d70..572658dd5 100644 --- a/ability/ability_runtime/abilitymanager/actsamscallbackthirdscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn index bb404efea..2996f4409 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfifthscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn index 140c37d53..89362b18a 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfirstscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn index bb9ffa777..1d0c9b8ed 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestfourthscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn index c4e09388f..c07ac1c76 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestsecondscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn index f982b0ac2..c67405bd2 100644 --- a/ability/ability_runtime/abilitymanager/actsamstestthirdscene/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn index c13620682..b9ec76482 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn index aa893e79e..a4c4d8965 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn index c1b531b83..bccf4c2b4 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn index 04ca71663..fb37afd00 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn index 64cc8690a..8853b8db6 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn index e4d097d5d..13776d913 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn index 40968164b..eaeb75569 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn index d2270882e..ad48f9ef4 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn index f1b8454b3..8ba377100 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn index 410d6e414..ddd96cde0 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn index 4c7ade0dc..6297b221f 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn b/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn index 1d7f643cc..3cd0bf7c0 100644 --- a/ability/ability_runtime/actsabilitydelegatorcase/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn b/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn index f46a00c09..f66e0f9fe 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/actsabilityusertest/BUILD.gn b/ability/ability_runtime/actsabilityusertest/BUILD.gn index ceb477ada..41a6978b1 100644 --- a/ability/ability_runtime/actsabilityusertest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn index fa0867412..a74e73e61 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn index 8922634be..0be14cb3c 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn index dec1d5baa..8ca9af12d 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn index 91dea07da..c94ccaf1a 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn b/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn index 1e81ee4a0..0aec8d0cd 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn b/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn index 4bb56ffa7..04c9c9635 100644 --- a/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn b/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn index a32cbe786..bd3c4ec7c 100644 --- a/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn b/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn index 217620fce..018fcd696 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn index e6c31b21c..5b7f07173 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn index e98b3f4c8..57fc9150e 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn index 36056d57a..1fe9fb65d 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn index 125e54b0e..5ff166f44 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn index 75f126032..b4ebea688 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn index 01923c8ab..7c3ad3912 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn index d5411ce92..3fd2ddbd1 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn index be5fe116b..3aff924a9 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn index 53c8c54a1..b395e853b 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn index c025b8f10..10f4699f2 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn index ab6b535b9..49af930e2 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn index 12b3a2e02..2c389d1a5 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn index 6bc4c54df..73a7bee1a 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn index 246c0ccc9..15e2ad814 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn index 5a1dd9bb4..e0e1a2076 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amsdatauriutils/BUILD.gn b/ability/ability_runtime/amsdatauriutils/BUILD.gn index 334a3426e..e5e4332ed 100644 --- a/ability/ability_runtime/amsdatauriutils/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn index d0cdaa3d3..23eabad08 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn index c73cf5a86..d1d32c9d0 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn index 94076317f..ed78cabf6 100644 --- a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn b/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn index 64212951a..4182a20dd 100644 --- a/ability/ability_runtime/apicover/apicoverhaptest/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/apicover/fasupplement/BUILD.gn b/ability/ability_runtime/apicover/fasupplement/BUILD.gn index 33bebd081..1b584cb78 100644 --- a/ability/ability_runtime/apicover/fasupplement/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/apicover/formmodule/BUILD.gn b/ability/ability_runtime/apicover/formmodule/BUILD.gn index 9a4fb6c9a..13d845198 100644 --- a/ability/ability_runtime/apicover/formmodule/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/apicover/stagesupplement/BUILD.gn b/ability/ability_runtime/apicover/stagesupplement/BUILD.gn index b41e46064..257ee0f12 100644 --- a/ability/ability_runtime/apicover/stagesupplement/BUILD.gn +++ b/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") { diff --git a/ability/ability_runtime/context/actscontexttest/BUILD.gn b/ability/ability_runtime/context/actscontexttest/BUILD.gn index 1c7a8a846..bc20877b2 100644 --- a/ability/ability_runtime/context/actscontexttest/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/context/scene/defpermission/BUILD.gn b/ability/ability_runtime/context/scene/defpermission/BUILD.gn index 90f795809..f613d81af 100644 --- a/ability/ability_runtime/context/scene/defpermission/BUILD.gn +++ b/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" diff --git a/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn b/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn index a7c8309ab..739455fe5 100644 --- a/ability/ability_runtime/fa/faapplicationinfo/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn b/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn index 3e398efca..bc41908a0 100644 --- a/ability/ability_runtime/fa/faconfigurationconstant/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/fa/facoverapi/BUILD.gn b/ability/ability_runtime/fa/facoverapi/BUILD.gn index 07d70fae8..14be9fb81 100644 --- a/ability/ability_runtime/fa/facoverapi/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn b/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn index 3b5ef3cfa..bbbb33491 100644 --- a/ability/ability_runtime/fa/faequeryabilitybywant/BUILD.gn +++ b/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 diff --git a/ability/ability_runtime/formmanager/BUILD.gn b/ability/ability_runtime/formmanager/BUILD.gn index b2a805349..9a28f457f 100644 --- a/ability/ability_runtime/formmanager/BUILD.gn +++ b/ability/ability_runtime/formmanager/BUILD.gn @@ -18,7 +18,7 @@ group("formmanager") { if (is_standard_system) { deps = [ "fa:formmanager", - #"stage:stage", + "stage:stage", ] } } diff --git a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn index b978d150f..8fd2d5d4f 100644 --- a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn @@ -13,19 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsNewWantApi7RelyHap") { +ohos_hap_assist_suite("ActsAmsNewWantApi7RelyHap") { hap_profile = "./entry/src/main/config.json" js_build_mode = "debug" hap_name = "ActsAmsNewWantApi7RelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn index 99f2ffec2..fe7342ad3 100644 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsNewWantARelyHap") { +ohos_hap_assist_suite("ActsAmsNewWantARelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsAmsNewWantARelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsnewwantarelyhap_js_assets", @@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantARelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsnewwantarelyhap_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn index 441e65252..57c40f13f 100644 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsNewWantBRelyHap") { +ohos_hap_assist_suite("ActsAmsNewWantBRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsAmsNewWantBRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsnewwantbrelyhap_js_assets", @@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantBRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsnewwantbrelyhap_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn index 9ea781fe1..1790d4868 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsNewWantRelyHap") { +ohos_hap_assist_suite("ActsAmsNewWantRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsAmsNewWantRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsnewwantrelyhap_js_assets", @@ -27,6 +25,9 @@ ohos_hap("ActsAmsNewWantRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsnewwantrelyhap_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn b/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn index a90e34bd6..17b7abee1 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn @@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsNewWantTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsNewWantTest" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsnewwanttest_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn index ef397f88c..ab065348d 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapAARelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapAARelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapaarelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn index 12e1e9c3d..488c41754 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapABRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapABRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapabrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn index d5a07a60f..175cfe886 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBARelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBARelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapbarelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn index d2de656f5..5ce180bd1 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBBRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBBRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapbbrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn index 02ab49f47..f430a3f4d 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBCRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBCRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapbcrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn index ecb1b25b0..5f396f696 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBDRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBDRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapbdrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn index d94602357..388ba1a1d 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBERelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBERelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapberelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn index 5be228dd2..a36cb3c53 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") { +ohos_hap_assist_suite("ActsAmsProcessMultiinstanceHapBFRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBFRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstancehapbfrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn index 0c8533159..c0560771c 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsprocessmultiinstance_app_profile") { -- GitLab