diff --git a/ability/ability_runtime/aacommand/AACommand07/BUILD.gn b/ability/ability_runtime/aacommand/AACommand07/BUILD.gn index 2d38d0d991f5c315fd91605c9df9eb540ae9d16e..9ed3a8f5aadf30ad26ee1df3e57196f1fae39bb4 100644 --- a/ability/ability_runtime/aacommand/AACommand07/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommand07/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("AACommand07") { +ohos_hap_assist_suite("AACommand07") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "AACommand07" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":aacommand07_js_assets", @@ -27,6 +25,9 @@ ohos_hap("AACommand07") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("aacommand07_app_profile") { diff --git a/ability/ability_runtime/aacommand/AACommand08/BUILD.gn b/ability/ability_runtime/aacommand/AACommand08/BUILD.gn index ef5d754d9fd13d482c8f43b4d5d8d457925e71f0..fe06d9b01a17883f0051e437e127d0156d63def8 100644 --- a/ability/ability_runtime/aacommand/AACommand08/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommand08/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("AACommand08") { +ohos_hap_assist_suite("AACommand08") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "AACommand08" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":aacommand08_js_assets", @@ -27,6 +25,9 @@ ohos_hap("AACommand08") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("aacommand08_app_profile") { diff --git a/ability/ability_runtime/aacommand/AACommandPrintSync/BUILD.gn b/ability/ability_runtime/aacommand/AACommandPrintSync/BUILD.gn index f095421e10d64ae54a6e5d9216def011169ad26b..34ba425aa5cd91a2b07a69dc23b3b83d3e72dd90 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSync/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommandPrintSync/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("AACommandPrintSync") { +ohos_hap_assist_suite("AACommandPrintSync") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "AACommandPrintSync" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":aacommandprintsync_js_assets", @@ -27,6 +25,9 @@ ohos_hap("AACommandPrintSync") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("aacommandprintsync_app_profile") { diff --git a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/BUILD.gn b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/BUILD.gn index 66111bd8eb50534aa5098008033b85dd236255a9..00e0570e94eecd572c1257017bca1d68f20bf726 100644 --- a/ability/ability_runtime/aacommand/AACommandPrintSyncTest/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommandPrintSyncTest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAACommandPrintSyncTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAACommandPrintSyncTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("aacommandprintsynctest_app_profile") { diff --git a/ability/ability_runtime/aacommand/AACommandRelyHap/BUILD.gn b/ability/ability_runtime/aacommand/AACommandRelyHap/BUILD.gn index af015d12e6880ef51205cc25901e8b309b7eaebe..8c3215983681d0ed4158e7622fb25d43e009faa1 100644 --- a/ability/ability_runtime/aacommand/AACommandRelyHap/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommandRelyHap/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("AACommandRelyHap") { +ohos_hap_assist_suite("AACommandRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "AACommandRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":aacommandrelyhap_js_assets", @@ -27,6 +25,9 @@ ohos_hap("AACommandRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("aacommandrelyhap_app_profile") { diff --git a/ability/ability_runtime/aacommand/AACommandpackage/BUILD.gn b/ability/ability_runtime/aacommand/AACommandpackage/BUILD.gn index d798dea094a0c08c96c291b5e38509d0cc4a46ee..4a02a87d488b731a356a604e886d79fbf119d543 100644 --- a/ability/ability_runtime/aacommand/AACommandpackage/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommandpackage/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("AACommandpackage") { +ohos_hap_assist_suite("AACommandpackage") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "AACommandpackage" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsaacommandtestatest_js_assets", @@ -27,6 +25,9 @@ ohos_hap("AACommandpackage") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsaacommandtestatest_app_profile") { diff --git a/ability/ability_runtime/aacommand/AACommandtest/BUILD.gn b/ability/ability_runtime/aacommand/AACommandtest/BUILD.gn index 3ab248977d5796c2b287f73633a1538d18eea3e3..4386ef941ba9d62360b7d283e5a2c9e7a3b24330 100644 --- a/ability/ability_runtime/aacommand/AACommandtest/BUILD.gn +++ b/ability/ability_runtime/aacommand/AACommandtest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAACommandTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAACommandTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("aacommandtest_app_profile") { diff --git a/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn b/ability/ability_runtime/abilitymanager/actsamscallbackfifthscene/BUILD.gn index 391e1a9589f71111c16c6571c05bba8edb6e39a1..933072fb5506a47ac4b4a2e5e0c9f6b40f94be82 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 ecd15d7bfe59577f1157466035c4f1b6fddf5b8e..0de865777dc474ba3675381ee70b539810c1624b 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 4c54032042ddfd4d8a81b05882189bc1ae2a16db..ed428847edcb21c8e9fb97e7771c9285ce972f89 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 fc0823c5619580660a3ed835154df699626717f6..0003853470e3d875d6cd3df5026f2d0ae40dd44e 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 79b9a0d70ef1d8aea1f1a58e108c6e14162ec208..572658dd53dc68c7294664902a6e3d738d5fb569 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 bb404efea206deb6f513417185d7996ee5a8bec0..2996f44091c2d5fcc141a3e3af8ce5b4496cfffa 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 140c37d5391389e848e355fb82a612732e16e9c8..89362b18a424f4cb302f01449500c4d892bf0831 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 bb9ffa777ab41df5da40df35a5aaa52a801e2a27..1d0c9b8ed703add7d79794dda91f341fc13d8d3c 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 c4e09388f63b092a0a47fd24ee89753197bf85a2..c07ac1c76c1613eb868a89af51dd1d993aa0cf95 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 f982b0ac260b142c9b5eafec949ae83a0306eed8..c67405bd2e87af18ff25f342673edf85ebbed266 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 c136206820f2713a3208eb9402cce9f6b75ebd8e..d370aa17e5b00b3e6a451f3784be28133977f8e4 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 aa893e79e2e4057eb507ee3fb1797733731c2ab9..5a233144965d1470128d865d64ebed6666d11e29 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 c1b531b833dd21827785712d6f9cce985d221f4a..3abce7a8717a6ac7d79c733ec8d061e935a24ff7 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 04ca71663f093aba5ae56ec21ee9dc68da9ec5fc..90fa2b963b4b13cb4863d8a61780c9dac83c5e76 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 64cc8690a79c919b97649925b122919c541f0bab..3d48888a92d03e6139353b4ab8e6bf1b186651ec 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/abilitymontior/BUILD.gn b/ability/ability_runtime/abilitymontior/BUILD.gn index 5392d42a922828be7f4ca3dc80523f6596f967be..827f63dc8f9d7181c67f2aef0f4ce4de7eee511e 100644 --- a/ability/ability_runtime/abilitymontior/BUILD.gn +++ b/ability/ability_runtime/abilitymontior/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAbilityMonitorTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAbilityMonitorTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("abilitymonitortest_app_profile") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn index e4d097d5d25108f2245ad2ef70d61414b6f79cf5..cf21d98583b223551a21697aa9c8ec8e30568dba 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 40968164b51877e9e18745b44dae87f9cae6c0c7..99deb7ee6efc8975ec941f76858e29b4d82e1a30 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 d2270882e71031b214324798f06c56ef91933f66..6da4981c834e519a3a2a2c2a0394dffd66648be1 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 f1b8454b303b2a9ac8ac602c203752d11ba0b6e4..9d6bca1fc6eff2d452067e7bd020fcc092cef2d7 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 410d6e41471fd37801a510e9600f23cb602037b9..fec675eee7261bec3c7106b08abda1e5ed64f939 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 4c7ade0dc5bfbe244641e2ac2fa776f8fe8d7209..6297b221f5a3685690cece5f26f4ad9a1d8637bd 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 1d7f643cc2fcfc07cd59c1ca8e81363c0cfa2f6b..3cd0bf7c08841696d4437a2028752e00c14cb347 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 f46a00c09886d8c5863852d49f43b58ea86cbbd4..f66e0f9feed2b7dd0d1b5eca05c8d514defd3b99 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 ceb477ada1b28a8c1d798d36a2d0c0d4d7f659bc..41a6978b12a711cbfa740b9a841ca589d106d421 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 fa08674129ae0bf7bc574f752b954117db407f1f..a74e73e61320aa7d5438dcd74a67dbc0b5804978 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 8922634becabb0906fb18d3bcedb61e210706866..0ba3dcfd5e8775fba761dfd63cff29b3491775f0 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 dec1d5baa6ab0073daabee01616f3709cbd58d97..f819712803137a32a754a78967d8dad062ec5fd6 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 91dea07daf9362bb9d5e5c9e5db7595ee5c51e4f..bf229ae9165434e188021aae6263cbdb037128e3 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 1e81ee4a091883bfca4db90e55da699051a0e659..0aec8d0cd464e0763663b3f60950c034cbab7b79 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 4bb56ffa760a1be6eb621e62f87f448fae7509a4..3f7a94967c73df7eb6bf8b5c8af542fca3bea9da 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 a32cbe786caf9bd31db664df38661b2774632764..e64c9f7fb566ab89aaa43c8ad378cdf0d292ddbc 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 217620fcef1a36dcba57c0541a92f40a1f5ab0dc..018fcd69650361240fef9f9b236ac0c4feab91eb 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/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn index b185801f219f2ca1326f40e541e83cfec0c1b158..9652cd443e559021d1edb39bddcfea3b29025f77 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn @@ -13,19 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsDataAbilityRelyHap") { +ohos_hap_assist_suite("ActsDataAbilityRelyHap") { hap_name = "ActsDataAbilityRelyHap" js_build_mode = "debug" hap_profile = "entry/src/main/config.json" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":dataability_resources", ":dataability_ts_assets", ] certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("dataability_ts_assets") { diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/BUILD.gn b/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/BUILD.gn index 19f712b1a510fc5374f094495d3e7188de6a2f99..35a7ed52eadd1032107918470073a5a50f6b000c 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/BUILD.gn +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/BUILD.gn @@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsFWKDataAccessorTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/BUILD.gn b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/BUILD.gn index 05e5d24a0f57f38ab35f5b88053f60eea172ce51..94c33509454b41c39aa1fedecb9e8974e1d5c915 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/BUILD.gn +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetabilitystatestagetest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsGetAbilityStatestAgeTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsGetAbilityStatestAgeTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsgetabilitystatestagetest_app_profile") { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/BUILD.gn b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/BUILD.gn index e353bab17af7977882c7c7c17dfcf3da8d9420e1..5b05f02742f176a63207dffa93b421ec7aa84f4e 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/BUILD.gn +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstageatest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsGetAppContextStageaTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsGetAppContextStageaTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsgetappcontextstageatest_app_profile") { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/BUILD.gn b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/BUILD.gn index cdf0d6095f6370b239b283955d26ffeed193ca02..9e6613340393e0f6fde2277a8dd1a449f6a91db4 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/BUILD.gn +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontextstagebtest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsGetAppContextStagebTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsGetAppContextStagebTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsgetappcontextstagebtest_app_profile") { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/BUILD.gn b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/BUILD.gn index 5c75d82fc1f5d355360114511db89d1c2b91e37c..9107f9ed99620f5c5b20966b421ae919e616fbd0 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/BUILD.gn +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetappcontexttest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsGetAppContextTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsGetAppContextTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsgetappcontexttest_app_profile") { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/BUILD.gn b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/BUILD.gn index 26f7fb523a8fc9db57c3026aaac807538500b22b..5a256de41ad333caa591c6e08954cb2790d42011 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/BUILD.gn +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystageatest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsGetcurrentTopAbilityStageaTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsGetcurrentTopAbilityStageaTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsgetcurrenttopabilitystageatest_app_profile") { diff --git a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/BUILD.gn b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/BUILD.gn index 8dddba27f2e3b734defd6533d8f292b70801343a..77689f7c9c01328d2b1ac35934b0c44dbfa68e00 100644 --- a/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/BUILD.gn +++ b/ability/ability_runtime/actsqueryfunctiontest/actsgetcurrenttopabilitystagebtest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsGetCurrentTopAbilityStagebTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsGetCurrentTopAbilityStagebTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsgetcurrenttopabilitystagebtest_app_profile") { diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/BUILD.gn index 67aea9e8d46b76bbc126e0c967883b0459f68b76..adb077d8ae9ba2966202ca4b2e1f1472d5a769a2 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/BUILD.gn +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityclienttest/BUILD.gn @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsServiceAbilityClientTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn index 4cb596fa8104c89c6678c097b9651fc90a2e7dbb..43b7d4d50b36f016e29c82b6a550a057640527f1 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn @@ -13,19 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsServiceAbilityServerRelyHap") { +ohos_hap_assist_suite("ActsServiceAbilityServerRelyHap") { hap_name = "ActsServiceAbilityServerRelyHap" js_build_mode = "debug" hap_profile = "entry/src/main/config.json" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":serviceability_resources", ":serviceability_ts_assets", ] certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("serviceability_ts_assets") { diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn index f697e063bdc63fdc93944b3ab778a00b17281967..7621ad6341985b6681f5d2aeee1328b5a8bea2b4 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn @@ -13,19 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsServiceAbilityServerSecondRelyHap") { +ohos_hap_assist_suite("ActsServiceAbilityServerSecondRelyHap") { hap_name = "ActsServiceAbilityServerSecondRelyHap" js_build_mode = "debug" hap_profile = "entry/src/main/config.json" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":serviceability_resources", ":serviceability_ts_assets", ] certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("serviceability_ts_assets") { diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/BUILD.gn b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/BUILD.gn index d29b393421a43c03046ccdb7a0ef4ba21783693d..f1196e0fc8885cd9736506e04114667cb8181081 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/BUILD.gn +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ActskillProcessWithAccountCloseTest/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActSkillProcessWithAccountCloseTest") { +ohos_hap_assist_suite("ActSkillProcessWithAccountCloseTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActSkillProcessWithAccountCloseTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actskillprocesswithaccountclosetest_js_assets", @@ -27,6 +25,8 @@ ohos_hap("ActSkillProcessWithAccountCloseTest") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actskillprocesswithaccountclosetest_app_profile") { diff --git a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/BUILD.gn b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/BUILD.gn index 969510da4b5bb3c18d07051c61cc976be068be21..aaaf1958c56d1e7051977a1eba4527002ef507de 100644 --- a/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/BUILD.gn +++ b/ability/ability_runtime/actsshellcommandfunctionalitytest/ExecuteShellCommand/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ExecuteShellCommand") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ExecuteShellCommand" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("executeshellcommand_app_profile") { diff --git a/ability/ability_runtime/actsstartrunnertest/BUILD.gn b/ability/ability_runtime/actsstartrunnertest/BUILD.gn index 3459aa862e268cc353ae35c16a0830f1e9613e41..6746aff11aa8c0e4c3214759e83740e826ec2896 100644 --- a/ability/ability_runtime/actsstartrunnertest/BUILD.gn +++ b/ability/ability_runtime/actsstartrunnertest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsStartRunnerTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsStartRunnerTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsstartrunnertest_app_profile") { diff --git a/ability/ability_runtime/actsstserviceabilityclientcase/BUILD.gn b/ability/ability_runtime/actsstserviceabilityclientcase/BUILD.gn index 14beae6bca4c09774853d011f12f2b7df54a1cb1..f78f0fe3a5105292fa3223b2a49e0cbebfe1db81 100644 --- a/ability/ability_runtime/actsstserviceabilityclientcase/BUILD.gn +++ b/ability/ability_runtime/actsstserviceabilityclientcase/BUILD.gn @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsStServiceAbilityClientCaseTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsStServiceAbilityClientCaseTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn index e6c31b21c318005c0a5981f7068f6fb50a5369a2..c8d412b5e2cce1ee67da2276b443273b10d6d22d 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 e98b3f4c8d186585f10eee36257e3260d0d64c44..9d5042ea8a43709721f61e4538a2284b3f25e8d0 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 36056d57a323abf8d3b571c8ca45ed5b88c2c4b5..6454481d618652d654d198b402d684afa7156249 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 125e54b0ed991b8cd0f09f1a1d80119de3235b43..e7807fa427239404ec9655a81f6e9b65f7774208 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 75f1260327f0005bd99a0e60d49c87263b0dbfd7..b4ebea688778e6a33a0283f03dcecf22452b1b71 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 01923c8abee711bf12c27f14d3f155d741afe10e..fde4293818f8e1f75361de7cf80807578d67e1af 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 d5411ce92f2f38e1d886c5fc2c20f0e7f7b945ef..3fd2ddbd166aeadc351b6e83c5391ac6b857d71e 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 be5fe116bdd431b29de1f9933b8262835c4f609f..8a694b4d42482ae94e1df50066782c037d7007f1 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 53c8c54a11b4ef517d87a84e7e33e903bee7ef67..b395e853b7be3a32b9e251924d58be96cf6f9cc3 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 c025b8f101a154f3c2d376a217353d4a479c8cdc..3354b52cab4bc70cba91aa11dda25fac9d5481dd 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 ab6b535b9c70e70d605806a08a90e7ad3d5cc475..f74270f9a7b59a87fd701b7d3f5c466d45e673cf 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 12b3a2e022c2a0e88993a1bbeedbe2a7df3ef86e..2c389d1a515c524d1d9d8a02cb7ddf7a097f5f3d 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 6bc4c54df9c204fc11c3fe14ac3f1b5ff2ad1ebe..73a7bee1a5da3d5bc6ca5a1c9f347f0039e08098 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 246c0ccc9bd7a569670c5c9ebca9cad4d680308f..15e2ad8142b1e5cab25cc9981ca21fec40791434 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 5a1dd9bb4ff51cf21b9504b5c7e3f82b789ed3ed..4a41528e6e3f326ca0fc30d0375c2627640b555d 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 334a3426e61dc0b05b9af923ee15657de37d9e24..e5e4332eded15b417998331d23e94db49d666125 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 d0cdaa3d39f944f50516d6dfb2285999737483a2..2626ed096a114e0fa765d64e6b98fdaeced0a9a1 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/actsamsstartabilityforresulttest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn index 6889f098406b8fe5da79f736505cfb7f0fef2c52..5235324d8642688ee099dfbefe17bff2aa2b0644 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn @@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsAmsStartAbilityForResultTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsStartAbilityForResultTest" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamsstartabilityforresulttest_app_profile") { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn index c73cf5a8630c41d49d97f95e6b73cf01f562f36a..d1d32c9d018af5275b9fcac26f04a1ac41086d76 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 94076317fe4d49a58d53395ef86ffc3ea98c9dc8..ed78cabf6ea490b5dd198aeece0623e03a947cc0 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 64212951a9b672d08eaf575e9a143b9fa9df92a8..4182a20dd2bdf2b67e3c30d427b814783f90f8dc 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 33bebd081a1de9de8651a23909a7adc905fd780c..7931603c9adc83d802e9cf7a51a52985e7f65738 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 9a4fb6c9a2ac68d5a8aa8235b39d17aea4eb1cd6..a52adcf04202c1b2fe8a4df66caf886bed02adc4 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 b41e4606414164a02d825f52c884944cf120732e..1801598d25f0d21179e6dbeacaee77a2da171481 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/apitest/BUILD.gn b/ability/ability_runtime/apitest/BUILD.gn index 4ee797221bf9879f4a5fc7b6824e43bcbbd7a95e..91bc8b2e313dce39720f361f6a656a5534db62ce 100644 --- a/ability/ability_runtime/apitest/BUILD.gn +++ b/ability/ability_runtime/apitest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsApiTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsApiTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("testapi_app_profile") { diff --git a/ability/ability_runtime/context/actscontexttest/BUILD.gn b/ability/ability_runtime/context/actscontexttest/BUILD.gn index 1c7a8a8462eba2fca0aca3a09edc0386ff1a9e9b..bc20877b258d188317605657eb2bcaf015fdb560 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 90f79580967e217cd19f0ec42fcf0eafd8aa4e48..8ebdcf5e2daf0a29c16e2a291dc1cd1068584b93 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 a7c8309ab39586a79f46d0cd990dab8c66b579c5..739455fe5b35678a3438eb5282d56c1b44c04010 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 3e398efca17cebc3a70f780a9297aa67c2f6654a..bc41908a05078a7cd46c4cfd78b1cb252b1c5b99 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 07d70fae804ea3df4f9806d7067cc281bd9b5608..14be9fb81f15f0f222ef5fe36f0de87db7901335 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 3b5ef3cfa590a9c3c53b534272f94a1eecca5c07..bbbb3349132ef2f4ec96f07cab45fd5909532548 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/featureability/actsfeatureabilitytest/BUILD.gn b/ability/ability_runtime/featureability/actsfeatureabilitytest/BUILD.gn index 0cc7c016d1e209609382c48bf0260444d5b54784..89b4782ea4d0da989f581e15d3403febf90d292f 100644 --- a/ability/ability_runtime/featureability/actsfeatureabilitytest/BUILD.gn +++ b/ability/ability_runtime/featureability/actsfeatureabilitytest/BUILD.gn @@ -21,6 +21,9 @@ ohos_js_hap_suite("ActsFeatureAbilityTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFeatureAbilityTest" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn index 0551673c6d9e6a8e0ae2143c06af51a971e58586..7ef8478b4c8dce9ccea422d67b9dc907ae86e237 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("FinishWithResultEmptyTest") { +ohos_hap_assist_suite("FinishWithResultEmptyTest") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "FinishWithResultEmptyTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn index ed6c72f0a26b6d1ad91adca0744f21b2205ce7f6..c4f436580568ea3ae4663270f77846bdc3bcb3bd 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("FinishWithResultPromiseParametersTest") { +ohos_hap_assist_suite("FinishWithResultPromiseParametersTest") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "FinishWithResultPromiseParametersTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn index 0dd27e7af1e10faa63dbf77c3d9469527f13122d..5133004bde31cb96c93cc704950cfc761a1100ff 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("FinishWithResultTest") { +ohos_hap_assist_suite("FinishWithResultTest") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "FinishWithResultTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn index 72ef3714c8817ff544e3e5f126f24a96df945927..64e8a3c9912bc4bf5156b1c5ab4906eca9d03c27 100644 --- a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("GetCallingBundlePromiseTest") { +ohos_hap_assist_suite("GetCallingBundlePromiseTest") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "GetCallingBundlePromiseTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn index 3b0684b8f4f14f0ccb01386261c68c71d48ed78a..b4d8b09d48199b2c914c74a408662dfe04dacdc2 100644 --- a/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("StartAbility") { +ohos_hap_assist_suite("StartAbility") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "StartAbility" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn index e1e3ea836c882bac2f2a5780892ff0d260e3a567..cc6943159548ba02a2b8ab123d3f6a80622d232d 100644 --- a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("StartAbilityForResult") { +ohos_hap_assist_suite("StartAbilityForResult") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "StartAbilityForResult" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn index 3ddfb2615cc76de46b7035028e0124d1c6941866..e9b2ddfa51975bc73f4f80c3a0a72d2cecf1b7de 100644 --- a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn @@ -12,19 +12,20 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("TerminateAbilityTest") { +ohos_hap_assist_suite("TerminateAbilityTest") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "TerminateAbilityTest" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/formmanager/BUILD.gn b/ability/ability_runtime/formmanager/BUILD.gn index b2a8053495c26451200260c3d66c230e63af1d6f..9a28f457fd0037db853b9ac1a6242aa3b23441a8 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/formmanager/fa/BUILD.gn b/ability/ability_runtime/formmanager/fa/BUILD.gn index f8328e9efeefab4b05dbe29a50a429d5c02586d3..0699c1a18b2b6509656d5ee15a39f990b7a1710d 100644 --- a/ability/ability_runtime/formmanager/fa/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/BUILD.gn @@ -56,7 +56,8 @@ group("formmanager") { "formsystemtest_ets/formgetformsinfotest/formswithoutpermtest:ActsFormsWithoutPermTest", "formsystemtest_ets/formgetformsinfotest/formszerotest:ActsFormsZeroTest", "formsystemtest_ets/formhostdeathrecipienttest:ActsFormHostDeathRecipientTest", - "formsystemtest_ets/formperformancetest:ActsFormPerformanceTest", + + #"formsystemtest_ets/formperformancetest:ActsFormPerformanceTest", "formsystemtest_ets/formreleasetest:ActsFormReleaseTest", "formsystemtest_ets/formstatetest_disable:ActsFormStateDisableTest", "formsystemtest_ets/formstatetest_enable:ActsFormStateEnableTest", diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn index 611f473743c3d768b279b7f9eb3f4d4940090564..40568499057572d68ee7b667258dacff081c4b25 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHost") { +ohos_hap_assist_suite("FormSystemHost") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHost") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHost" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn index 9ea8290fc73be46fc72fe49ea9e55b4331efd879..6277c1338d28150cb257b296b2fec9473eb80b51 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostB") { +ohos_hap_assist_suite("FormSystemHostB") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostB") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostB" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn index b80b51613bb9acbd553eac5859caa09f801adbfc..7835ea2f68588505cf32bf146f2b9aed5682d675 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostC") { +ohos_hap_assist_suite("FormSystemHostC") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostC") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostC" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/BUILD.gn index cc8e89d347280e6af57008857ceaa4f3b5511527..c53a9104d5d9fdede74f5429b0efc0905289c79f 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostD") { +ohos_hap_assist_suite("FormSystemHostD") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostD") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostD" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/BUILD.gn index 4560bf2cbd7b236b04d3395cdae8b2d5b2f6e3e4..c833ae9182dbe4d7929c9c87c08e4a68b3335fbd 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostE") { +ohos_hap_assist_suite("FormSystemHostE") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostE") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostE" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/BUILD.gn index b7d9436d481578465454316c78a1df8afe41e083..c238a7cddb8fb1d4f43bdf51cc122f2b5a1a3c2c 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostF") { +ohos_hap_assist_suite("FormSystemHostF") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostF") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostF" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/BUILD.gn index 1f1072a000ad1b22fb65a8d91ca66c5db8f7b2a5..714cba4a781868a0c6ea572d0e47c60712faee4e 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostG") { +ohos_hap_assist_suite("FormSystemHostG") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostG") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostG" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn index a277d3dbd03d92d12c5878ad4c5e18c13ea68ae1..67ba2426cda92e601b456ebc852a524a7ceb65fd 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostI") { +ohos_hap_assist_suite("FormSystemHostI") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostI") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostI" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn index f8ef62db3ea4b7d164dfd942a553d87a324333d9..91079a4aa02547ff5743cea83bf88a63636d4336 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostJ") { +ohos_hap_assist_suite("FormSystemHostJ") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostJ") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostJ" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/BUILD.gn index 4d602e35722dc85dffb2c94eec372f1d74aa3a3a..97e9c38efa743ca8c8efd458ddd19a267e125db7 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostK") { +ohos_hap_assist_suite("FormSystemHostK") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostK") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostK" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/BUILD.gn index 6401c872c1c2d1dde40652ff94269f9b55019eda..216d67da0e0df7c2db839c092cacb96af69daba2 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostL") { +ohos_hap_assist_suite("FormSystemHostL") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostL") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostL" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/BUILD.gn index d7b02548137eb89c896c6479c4942140a758e911..701aa021f5c0bc1be8a664e02f3b8a06fb81ec23 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostN") { +ohos_hap_assist_suite("FormSystemHostN") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostN") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostN" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/BUILD.gn index dd97acaaa601433a4f0c0a797b3df6ddee241bd0..92a8baef1d3b40c0b290e7d4eaf27d75f26f7771 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostNoPerm") { +ohos_hap_assist_suite("FormSystemHostNoPerm") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostNoPerm") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostNoPerm" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/BUILD.gn index edd31494dd18a95ed227d85171bad85184265f90..0f9628540ad60f630e0306068a2f2315057dbe43 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostO") { +ohos_hap_assist_suite("FormSystemHostO") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostO") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostO" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/BUILD.gn b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/BUILD.gn index 8758ce8b3af40cac08a578c535397ee925cb7a74..c40e82df68dd9db1f86d08ef4aac24a285df3ca5 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemHostP") { +ohos_hap_assist_suite("FormSystemHostP") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", @@ -23,9 +23,9 @@ ohos_hap("FormSystemHostP") { certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "FormSystemHostP" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/BUILD.gn index 7f60a658becddc5eb50c1995bc877cd54641ce19..f9518c1b70798590426527695292f4179be054b9 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationA/BUILD.gn @@ -13,12 +13,10 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppA") { +ohos_hap_assist_suite("FormSupplyAppA") { hap_profile = "entry/src/main/config.json" hap_name = "FormSupplyAppA" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ ":FormOfFaEts_form_js_assets", @@ -26,8 +24,8 @@ ohos_hap("FormSupplyAppA") { ":FormOfFaEts_resources", ] certificate_profile = "signature/openharmony_sx.p7b" - part_name = "prebuilt_hap" - subsystem_name = "applications" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn index d59f472146887ac801caeef23dec6b409f7eb825..2fc39839cc5f21057a3d6878b5f8aea6a132f677 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn @@ -13,12 +13,10 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppB") { +ohos_hap_assist_suite("FormSupplyAppB") { hap_profile = "entry/src/main/config.json" hap_name = "FormSupplyAppB" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ ":FormOfFaEts_form_js_assets", @@ -26,8 +24,8 @@ ohos_hap("FormSupplyAppB") { ":FormOfFaEts_resources", ] certificate_profile = "signature/openharmony_sx.p7b" - part_name = "prebuilt_hap" - subsystem_name = "applications" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/BUILD.gn index 20edf61ce834442980f16549069fb948b8291cee..79182b3be0229f2e0e0496085905e9411f78bd4a 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/BUILD.gn @@ -13,12 +13,10 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppC") { +ohos_hap_assist_suite("FormSupplyAppC") { hap_profile = "entry/src/main/config.json" hap_name = "FormSupplyAppC" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ ":FormOfFaEts_form_js_assets", @@ -26,8 +24,8 @@ ohos_hap("FormSupplyAppC") { ":FormOfFaEts_resources", ] certificate_profile = "signature/openharmony_sx.p7b" - part_name = "prebuilt_hap" - subsystem_name = "applications" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn index 2c90c54fbcb5f178a535c927c7451e9f1996b858..e8669749959bbbe18e94a3ca86cf91c0b0521945 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppD") { +ohos_hap_assist_suite("FormSupplyAppD") { hap_profile = "entry/src/main/config.json" deps = [ ":FormOfFaEts_form_js_assets", @@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppD") { ] certificate_profile = "signature/openharmony_sx.p7b" hap_name = "FormSupplyAppD" - part_name = "prebuilt_hap" - subsystem_name = "applications" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn index 8d7495d436373d65ba5f450fcca79c0755e42e88..bef0e15dc37836010846de9b28fe9697470277f5 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppE") { +ohos_hap_assist_suite("FormSupplyAppE") { hap_profile = "entry/src/main/config.json" deps = [ ":FormOfFaEts_form_js_assets", @@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppE") { ] certificate_profile = "signature/openharmony_sx.p7b" hap_name = "FormSupplyAppE" - part_name = "prebuilt_hap" - subsystem_name = "applications" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn index fd269ba5f754d5fc8dc1ed232bae2fc3fc5500c5..55f4ee20329affc847a093fb9775dde078a25140 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppF") { +ohos_hap_assist_suite("FormSupplyAppF") { hap_profile = "entry/src/main/config.json" deps = [ ":FormOfFaEts_form_js_assets", @@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppF") { ] certificate_profile = "signature/openharmony_sx.p7b" hap_name = "FormSupplyAppF" - part_name = "prebuilt_hap" - subsystem_name = "applications" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn index 19d74e9e04195a009792881e9c7ffa073bc3c2b7..678003858de8ba39829fe3bec08ef7701630239d 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppG") { +ohos_hap_assist_suite("FormSupplyAppG") { hap_profile = "entry/src/main/config.json" deps = [ ":FormOfFaEts_form_js_assets", @@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppG") { ] certificate_profile = "signature/openharmony_sx.p7b" hap_name = "FormSupplyAppG" - part_name = "prebuilt_hap" - subsystem_name = "applications" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn index 54356b479e4e9a144fdf5c85fdbe6e5810584d9e..c8161a755ed8370ba40353620060cff573216820 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppH") { +ohos_hap_assist_suite("FormSupplyAppH") { hap_profile = "entry/src/main/config.json" deps = [ ":FormOfFaEts_form_js_assets", @@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppH") { ] certificate_profile = "signature/openharmony_sx.p7b" hap_name = "FormSupplyAppH" - part_name = "prebuilt_hap" - subsystem_name = "applications" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn index 86e8471c15402af5031ca56051dfc07344663e42..8e69ef2cb1384b6bfe3f9e089903a1e3a6277d9b 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSupplyAppNS") { +ohos_hap_assist_suite("FormSupplyAppNS") { hap_profile = "entry/src/main/config.json" deps = [ ":FormOfFaEts_form_js_assets", @@ -22,12 +22,10 @@ ohos_hap("FormSupplyAppNS") { ] certificate_profile = "signature/openharmony_sx.p7b" hap_name = "FormSupplyAppNS" - part_name = "prebuilt_hap" - subsystem_name = "applications" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("FormOfFaEts_js_assets") { diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn index 2b5f2d5b8b4bfc8c289583cc6c5eca74f668a81a..48f78ebcd3c2a10d2b130e2449092ea777d7adac 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemProviderA") { +ohos_hap_assist_suite("FormSystemProviderA") { hap_name = "FormSystemProviderA" hap_profile = "./entry/src/main/config.json" deps = [ @@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderA") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/BUILD.gn index ccaf90592ee342957ebe72f64a19fadafd50dffb..526ebb76f0ebccae5570652b53abef6a9550b3f3 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderb/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemProviderB") { +ohos_hap_assist_suite("FormSystemProviderB") { hap_name = "FormSystemProviderB" hap_profile = "./entry/src/main/config.json" deps = [ @@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderB") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/BUILD.gn index 5b3eab9f203241fa47b3ed2cdd1b74847cae663c..86e572eb4f106121378e63cae2fa7dbe8241e8dd 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderc/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemProviderC") { +ohos_hap_assist_suite("FormSystemProviderC") { hap_name = "FormSystemProviderC" hap_profile = "./entry/src/main/config.json" deps = [ @@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderC") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/BUILD.gn b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/BUILD.gn index b8354bf6eadf83f17a73af04bc5fd9d9a9cb7066..d73e6e7bc6976c7084fd1b92a5eb8ee58d79e32b 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsystemproviderd/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("FormSystemProviderD") { +ohos_hap_assist_suite("FormSystemProviderD") { hap_name = "FormSystemProviderD" hap_profile = "./entry/src/main/config.json" deps = [ @@ -23,9 +23,9 @@ ohos_hap("FormSystemProviderD") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" js_build_mode = "debug" - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn index 934fb9670196491ec19b77befd61f7aff2ebfa01..8ef13928a7811cd09491f33906a5196354f80eee 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormAcquireTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormAcquireTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn index 2020ff3bcdd6db27d25fba0d8b474bfe83bfad8d..c71a0b1237a6858c85d778c1e7a4f5fa3b1b8613 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormAcquire2Test") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormAcquire2Test" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/BUILD.gn index 8ceff4401121ed76f0685f43723e55e8ad954403..9e47d17cbe6e9f8fa3201aed7f261b2dccaaa22a 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormDeleteTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormDeleteTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/BUILD.gn index 66399f5e26d93a3aeb397acb9792ccc6ba9b8518..7667b3cc946907895c473a365cbe1382ee40bae2 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormDynamicRefreshTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormDynamicRefreshTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/BUILD.gn index 4752dc5f6ded2fc7fc7cb0d1d13f47302d006cc8..cd7895dd4feff4de2ff1d14180c5b691e25b9cfe 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formfuzztest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormFuzzTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormFuzzTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn index 85549b028a9ba9a39d71e1128b24b0deb13a5b20..d33dd2b17a876365591b3f2569402a25595814da 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsOneAndOneTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormsOneAndOneTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn index 7287717f786c3518c0930bc76963bfeaf42357a2..2bf6b395d8457c17fb12e15b81741b2be8e185a7 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsOneAndTwoTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormsOneAndTwoTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn index e42e7fe0f02bc0f630b243529aa7029e4bab40e4..669989594dac25b4d740f7962dc2b6c3376a6a62 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsOneAndZeroTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormsOneAndZeroTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn index 685e2c58c71e947e368c1a2ddea55ff50e045683..6f7352b1936c20a1b5702a3907f53ed9a384d39a 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsWithoutPermTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormsWithoutPermTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn index 600e697f9eec3a0bb18e3aa1eb22404953149ce1..0abc21cd6dbcc7f9b1fd4ebf81a6387e4bb76537 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormsZeroTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormsZeroTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn index d70bb93c24e829e90ef754507265376003f02f94..a03ce7fae6dc5795fb8e53ce4be15e133c0687af 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormHostDeathRecipientTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormHostDeathRecipientTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/BUILD.gn index 585c089735ff2cd75fef593fd215f882f368ed8e..3cb29b2eaed9c7ef14ccf496367cf38228c96791 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormPerformanceTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormPerformanceTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/BUILD.gn index 183e77bfac9167306ec6b1bfae1f06a855ddd823..ca387290273119127b2bcf827d1c5bfbfa2efafa 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormReleaseTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormReleaseTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/BUILD.gn index 142bc8cd5885c9d7ef28eb71f697b61416d45444..c69de805104f6027fa91d5a4423ecb39446b2bb5 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateDisableTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormStateDisableTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/BUILD.gn index f1789b1697ae98b62042e4e71bb6e2665907b282..23fe654556dbf49ab1faf16f45f561d213a70bb2 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateEnableTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormStateEnableTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn index e39eb2d6222d2952d78503442a5312dde4fa3d88..b89130654451f2ed119247197fc5f94fc659db24 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateNotifyInvisibleTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormStateNotifyInvisibleTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn index a9c532b5372d3a94deb7c01cdeb0aaa9acc03663..384ea328e786459c8f42d11c276a65738893d07b 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateNotifyInvisible2Test") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormStateNotifyInvisible2Test" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn index f3068bd2113bf7895b789370e6de0eaa0496030c..fa7596556050b3228f9de68e3df53aec9b96f226 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStateNotifyVisibleTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormStateNotifyVisibleTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/BUILD.gn index 6221047d9f177d609ced81cb02f1839d462fe406..1e9a3a85814b9a655d603a4560ed0a3188e0762f 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormStressTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormStressTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/BUILD.gn b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/BUILD.gn index df641072b5f46ecb6205fbe80cf3c63369b2704e..ec41ac74ade9d1ec3228b18007212b2ae58fa6d6 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/BUILD.gn @@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFormUpdateRefreshTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsFormUpdateRefreshTest" + subsystem_name = "ability" + part_name = "form_fwk" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn index ab5874b3563a523bebb88cbb68d53fcd94889f09..d074d033cb416e7410263f97026c7113fae1c889 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn @@ -13,12 +13,10 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsKillProcessWithAccountRelyHap") { +ohos_hap_assist_suite("ActsKillProcessWithAccountRelyHap") { hap_profile = "entry/src/main/module.json" hap_name = "ActsKillProcessWithAccountRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actskillprocesswithaccountrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsKillProcessWithAccountRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actskillprocesswithaccountrelyhap_app_profile") { diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn index 19169f2c2f7a4f3b3c411abb600033381134797c..281aded55929458f38ad1b7ee99e52bdbcb08610 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsKillProcessWithAccountTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsKillProcessWithAccountTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actskillprocesswithaccounttest_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn index b978d150f64f2d7e8447a0416eb4164607380ddc..cdac1bf03b03f5294a9a8f5032b04e4d9709ed52 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 99f2ffec2fe195a35c26193fdca925f064907314..1491cbdfd138b59899c2916090c74e456444d2ee 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 441e65252fbdc1c1a228124b0bc20919b573355e..baca50d3a72d5075e64e691f177b256f134ace0a 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 9ea781fe1b3e3381716d70cac5b9e053a3b0311e..20a20f2f538f36ec64045f7089169394aef38371 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 a90e34bd620f0d824b28d07ad850743da0cf8b74..17b7abee12653a10c7b25ca7a11940685b64aa63 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/non_concurrent/acts_systemappa_test/BUILD.gn b/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn index 8951f04ccb93e05bce5edefdd1167164d5ca9bc2..2cb4c55484a719f7c608868a03a4643b395750a6 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsSystemAppATest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsSystemAppATest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actssystemappatest_app_profile") { diff --git a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn index d3e0551c72c73387a6a1045a0fdaaa6d76e1d25f..84954ad9ad9c0ca637a7dc41e98922409bfef162 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn +++ b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsSystemAppOneRelyHap") { +ohos_hap_assist_suite("ActsSystemAppOneRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsSystemAppOneRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":acts_systemappone_rely_test_js_assets", @@ -27,6 +25,8 @@ ohos_hap("ActsSystemAppOneRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("acts_systemappone_rely_test_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn index ef397f88cccc0ff5638d059c4e97bf2af9b45f47..f2ff98e7d518a7f4cdcd27bde690343dec6b9769 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 12e1e9c3d2185d39075987d25ca35c9ea482c955..736f393188668707ddb941fa0a8385f6dcee71df 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 d5a07a60fdb65cf59b1c0d2fcea974a2c6d5dcd3..f9aa4a012eae72091e43cdf037c5c29374fb0011 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 d2de656f5fab54c2295f5531a90f7eebf3755daf..36cd6aa204601c91f4949a102092d5107050f291 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 02ab49f475adbfcaf126ba5292628a0c038b4c54..3e91bd044a34170e655ab884c299b536de10df88 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 ecb1b25b0e6a2253fa22ce19008a203086136a9e..9aa75199837b33207e978909ac19edb1152359d4 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 d946023576bc361f057001ea14a2e2a01ceea86e..7513f1e0abd519a78fea9c6381b17ed47db04bec 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 5be228dd262f53acc0d59deaadb4739b4dabaef3..f4765378b1903368ac1b3132d3d7ed1dbc0e3670 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 0c85331592d4630557313284dd237a5eb20570e9..c0560771ceebf1ba0c76c047c4991833b76ce4e3 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") { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn index c939fc5249840a2475555cfc3352ce06fb21b52c..397c3d50c225cdfa06a1e457d4fcdb16dc83d365 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn @@ -13,12 +13,10 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsLifecycleMultiHap2") { +ohos_hap_assist_suite("ActsLifecycleMultiHap2") { hap_name = "ActsLifecycleMultiHap2" js_build_mode = "debug" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true hap_profile = "entry/src/main/module.json" deps = [ @@ -27,6 +25,9 @@ ohos_hap("ActsLifecycleMultiHap2") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actslifecyclemultihap2_app_profile") { diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn index 0f8bac95043f2be445e453baf369030993c2a0bf..438e0460fe5ddfd1c3d07bc16e5c97818ae598ce 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn @@ -13,13 +13,11 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsLifecycleMultiHap3") { +ohos_hap_assist_suite("ActsLifecycleMultiHap3") { hap_name = "ActsLifecycleMultiHap3" js_build_mode = "debug" hap_profile = "entry/src/main/module.json" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actslifecyclemultihap3_js_assets", @@ -27,6 +25,9 @@ ohos_hap("ActsLifecycleMultiHap3") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actslifecyclemultihap3_app_profile") { diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn index 53d7853fe267198cf93123d6d776d9a93c3e7a99..84046df68a4a3d11269f666d16361efc962748d3 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn @@ -23,6 +23,9 @@ ohos_js_hap_suite("ActsLifecycleMultiHapTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsLifecycleMultiHapTest" + + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actslifecyclemultihaptest_app_profile") { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/BUILD.gn b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/BUILD.gn index dab24db003f67a3d0d8521b6573ef91426ad01a3..ceeeb3e4d858a279088d5f186a295f7f443bf9c1 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/BUILD.gn +++ b/ability/ability_runtime/stage/actswindowstagelifecyclemultihaptest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsWindowStageLifecycleMultiHapTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsWindowStageLifecycleMultiHapTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actswindowstagelifecyclemultihaptest_app_profile") { diff --git a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/BUILD.gn b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/BUILD.gn index d7669636acae52ea66a922f4685cd4e072b8d3e6..0a0e96f7a23f09c594abaaea02733d30beb5b286 100755 --- a/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/BUILD.gn +++ b/ability/ability_runtime/stage/actswindowstagelifecyclesinglehaptest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsWindowStageLifecycleSingleHapTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsWindowStageLifecycleSingleHapTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actswindowstagelifecyclesinglehaptest_app_profile") { diff --git a/ability/ability_runtime/want/actsgetwantalltest/BUILD.gn b/ability/ability_runtime/want/actsgetwantalltest/BUILD.gn index 0720cfc6bd947135d5139266fc62316e7403b17b..3214ed3b1b76c65d1c8725cd6f31b0691d0bd874 100644 --- a/ability/ability_runtime/want/actsgetwantalltest/BUILD.gn +++ b/ability/ability_runtime/want/actsgetwantalltest/BUILD.gn @@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsGetWantAllTest") { ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActsGetWantAllTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { js2abc = true diff --git a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn index 33e877cd8fa3c4ecbb0ece2c6ee0577b63d193a3..c95f1f4bc21777965d3e71b43d66e78e864a42b6 100644 --- a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn +++ b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn @@ -12,19 +12,19 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsGetWantAllTestHap") { +ohos_hap_assist_suite("ActsGetWantAllTestHap") { hap_profile = "./src/main/config.json" js_build_mode = "debug" hap_name = "ActsGetWantAllTestHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/ability/ability_runtime/workercontextcover/workercontexttest/BUILD.gn b/ability/ability_runtime/workercontextcover/workercontexttest/BUILD.gn index c723cf41f2f2f1f185d527ad216792e50be599b2..979e66f59746b5ba47f1feedcbf0c2b69dc5da61 100644 --- a/ability/ability_runtime/workercontextcover/workercontexttest/BUILD.gn +++ b/ability/ability_runtime/workercontextcover/workercontexttest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsWorkerContextTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsWorkerContextTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("workercontexttest_app_profile") { diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn b/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn index b3266873926c57d3396281901620c5663dc7db3a..e846967bd3906d57aaaca238236d339f8864a8c0 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAmsZidlClientTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsZidlClientTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamszidlclienttest_app_profile") { diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn b/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn index c669685f1410928a447df0948ace3aa24bfcd9c8..c9ac8571e07429934720670a09cc87985a527d0d 100644 --- a/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn +++ b/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn @@ -13,7 +13,7 @@ import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsAmsZidlServiceRelyHap") { +ohos_hap_assist_suite("ActsAmsZidlServiceRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ @@ -23,10 +23,10 @@ ohos_hap("ActsAmsZidlServiceRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsZidlServiceRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsamszidlservicerelyhap_app_profile") {