From 5bd5a367fd121dba09cfaff2cc77e3c7a5c974e3 Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Fri, 5 Aug 2022 19:51:26 +0800 Subject: [PATCH] =?UTF-8?q?XTS=E6=B5=8B=E8=AF=95=E5=A5=97=E9=83=A8?= =?UTF-8?q?=E4=BB=B6=E5=8C=96=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- ability/ability_runtime/aacommand/AACommand07/BUILD.gn | 9 +++++---- ability/ability_runtime/aacommand/AACommand08/BUILD.gn | 9 +++++---- .../aacommand/AACommandPrintSync/BUILD.gn | 9 +++++---- .../aacommand/AACommandPrintSyncTest/BUILD.gn | 2 ++ .../ability_runtime/aacommand/AACommandRelyHap/BUILD.gn | 9 +++++---- .../ability_runtime/aacommand/AACommandpackage/BUILD.gn | 9 +++++---- ability/ability_runtime/aacommand/AACommandtest/BUILD.gn | 2 ++ ability/ability_runtime/abilitymontior/BUILD.gn | 2 ++ .../actsdataabilityrelyhap/BUILD.gn | 9 +++++---- .../actsfwkdataaccessortest/BUILD.gn | 3 +++ .../actsgetabilitystatestagetest/BUILD.gn | 2 ++ .../actsgetappcontextstageatest/BUILD.gn | 2 ++ .../actsgetappcontextstagebtest/BUILD.gn | 2 ++ .../actsqueryfunctiontest/actsgetappcontexttest/BUILD.gn | 2 ++ .../actsgetcurrenttopabilitystageatest/BUILD.gn | 2 ++ .../actsgetcurrenttopabilitystagebtest/BUILD.gn | 2 ++ .../actsserviceabilityclienttest/BUILD.gn | 2 ++ .../actsserviceabilityserverrelyhap/BUILD.gn | 8 ++++---- .../actsserviceabilityserversecondrelyhap/BUILD.gn | 8 ++++---- .../ActskillProcessWithAccountCloseTest/BUILD.gn | 8 ++++---- .../ExecuteShellCommand/BUILD.gn | 2 ++ ability/ability_runtime/actsstartrunnertest/BUILD.gn | 2 ++ .../actsstserviceabilityclientcase/BUILD.gn | 2 ++ .../actsamsstartabilityforresulttest/BUILD.gn | 3 +++ ability/ability_runtime/apitest/BUILD.gn | 2 ++ .../featureability/actsfeatureabilitytest/BUILD.gn | 3 +++ .../sceneproject/finishwithresultemptytest/BUILD.gn | 9 +++++---- .../finishwithresultpromiseparameterstest/BUILD.gn | 9 +++++---- .../sceneproject/finishwithresulttest/BUILD.gn | 9 +++++---- .../sceneproject/getcallingbundletest/BUILD.gn | 9 +++++---- .../featureability/sceneproject/startability/BUILD.gn | 9 +++++---- .../sceneproject/startabilityforresult/BUILD.gn | 9 +++++---- .../sceneproject/terminateabilitytest/BUILD.gn | 9 +++++---- ability/ability_runtime/formmanager/fa/BUILD.gn | 2 +- .../fa/formhostst_ets/formsystemhost/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostb/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostc/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostd/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhoste/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostf/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostg/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhosti/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostj/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostk/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostl/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostn/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostnoperm/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhosto/BUILD.gn | 6 +++--- .../fa/formhostst_ets/formsystemhostp/BUILD.gn | 6 +++--- .../formproviderst_ets/formsupplyapplicationA/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationB/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationC/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationD/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationE/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationF/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationG/BUILD.gn | 8 +++----- .../formproviderst_ets/formsupplyapplicationH/BUILD.gn | 8 +++----- .../formsupplyapplicationNotSysApp/BUILD.gn | 8 +++----- .../fa/formproviderst_ets/formsystemprovidera/BUILD.gn | 6 +++--- .../fa/formproviderst_ets/formsystemproviderb/BUILD.gn | 6 +++--- .../fa/formproviderst_ets/formsystemproviderc/BUILD.gn | 6 +++--- .../fa/formproviderst_ets/formsystemproviderd/BUILD.gn | 6 +++--- .../fa/formsystemtest_ets/formacquiretest/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formacquiretest2/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formdeletetest/BUILD.gn | 2 ++ .../formsystemtest_ets/formdynamicrefreshtest/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formfuzztest/BUILD.gn | 2 ++ .../formgetformsinfotest/formsoneandonetest/BUILD.gn | 2 ++ .../formgetformsinfotest/formsoneandtwotest/BUILD.gn | 2 ++ .../formgetformsinfotest/formsoneandzerotest/BUILD.gn | 2 ++ .../formgetformsinfotest/formswithoutpermtest/BUILD.gn | 2 ++ .../formgetformsinfotest/formszerotest/BUILD.gn | 2 ++ .../formhostdeathrecipienttest/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formperformancetest/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formreleasetest/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formstatetest_disable/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formstatetest_enable/BUILD.gn | 2 ++ .../formstatetest_notifyinvisible/BUILD.gn | 2 ++ .../formstatetest_notifyinvisible2/BUILD.gn | 2 ++ .../formstatetest_notifyvisible/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formstresstest/BUILD.gn | 2 ++ .../fa/formsystemtest_ets/formupdatefreshtest/BUILD.gn | 2 ++ .../ActsKillProcessWithAccountRelyHap/BUILD.gn | 8 ++++---- .../ActsKillProcessWithAccountTest/BUILD.gn | 2 ++ .../non_concurrent/acts_systemappa_test/BUILD.gn | 2 ++ .../non_concurrent/acts_systemappone_rely_test/BUILD.gn | 8 ++++---- .../stage/actslifecyclemultihap2/BUILD.gn | 9 +++++---- .../stage/actslifecyclemultihap3/BUILD.gn | 9 +++++---- .../stage/actslifecyclemultihaptest/BUILD.gn | 3 +++ .../stage/actswindowstagelifecyclemultihaptest/BUILD.gn | 2 ++ .../stage/actswindowstagelifecyclesinglehaptest/BUILD.gn | 2 ++ ability/ability_runtime/want/actsgetwantalltest/BUILD.gn | 2 ++ .../want/sceneProject/actsgetwantalltesthap/BUILD.gn | 8 ++++---- .../workercontextcover/workercontexttest/BUILD.gn | 2 ++ .../zidltest/actsamszidlclienttest/BUILD.gn | 2 ++ .../ability_runtime/zidltest/actsamszidlservice/BUILD.gn | 8 ++++---- 96 files changed, 282 insertions(+), 191 deletions(-) diff --git a/ability/ability_runtime/aacommand/AACommand07/BUILD.gn b/ability/ability_runtime/aacommand/AACommand07/BUILD.gn index 2d38d0d99..9ed3a8f5a 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 ef5d754d9..fe06d9b01 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 f095421e1..34ba425aa 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 66111bd8e..00e0570e9 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 af015d12e..8c3215983 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 d798dea09..4a02a87d4 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 3ab248977..4386ef941 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/abilitymontior/BUILD.gn b/ability/ability_runtime/abilitymontior/BUILD.gn index 5392d42a9..827f63dc8 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/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn index b185801f2..9652cd443 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 19f712b1a..35a7ed52e 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 05e5d24a0..94c335094 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 e353bab17..5b05f0274 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 cdf0d6095..9e6613340 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 5c75d82fc..9107f9ed9 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 26f7fb523..5a256de41 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 8dddba27f..77689f7c9 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 67aea9e8d..adb077d8a 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 4cb596fa8..43b7d4d50 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 f697e063b..7621ad634 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 d29b39342..f1196e0fc 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 969510da4..aaaf1958c 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 3459aa862..6746aff11 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 14beae6bc..f78f0fe3a 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/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn index 6889f0984..5235324d8 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/apitest/BUILD.gn b/ability/ability_runtime/apitest/BUILD.gn index 4ee797221..91bc8b2e3 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/featureability/actsfeatureabilitytest/BUILD.gn b/ability/ability_runtime/featureability/actsfeatureabilitytest/BUILD.gn index 0cc7c016d..89b4782ea 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 0551673c6..7ef8478b4 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 ed6c72f0a..c4f436580 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 0dd27e7af..5133004bd 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 72ef3714c..64e8a3c99 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 3b0684b8f..b4d8b09d4 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 e1e3ea836..cc6943159 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 3ddfb2615..e9b2ddfa5 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/fa/BUILD.gn b/ability/ability_runtime/formmanager/fa/BUILD.gn index f8328e9ef..69d6daa6a 100644 --- a/ability/ability_runtime/formmanager/fa/BUILD.gn +++ b/ability/ability_runtime/formmanager/fa/BUILD.gn @@ -56,7 +56,7 @@ group("formmanager") { "formsystemtest_ets/formgetformsinfotest/formswithoutpermtest:ActsFormsWithoutPermTest", "formsystemtest_ets/formgetformsinfotest/formszerotest:ActsFormsZeroTest", "formsystemtest_ets/formhostdeathrecipienttest:ActsFormHostDeathRecipientTest", - "formsystemtest_ets/formperformancetest:ActsFormPerformanceTest", + #"formsystemtest_ets/formperformancetest:ActsFormPerformanceTest", "formsystemtest_ets/formreleasetest:ActsFormReleaseTest", "formsystemtest_ets/formstatetest_disable:ActsFormStateDisableTest", "formsystemtest_ets/formstatetest_enable:ActsFormStateEnableTest", 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 611f47374..405684990 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 9ea8290fc..6277c1338 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 b80b51613..7835ea2f6 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 cc8e89d34..c53a9104d 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 4560bf2cb..c833ae918 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 b7d9436d4..c238a7cdd 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 1f1072a00..714cba4a7 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 a277d3dbd..67ba2426c 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 f8ef62db3..91079a4aa 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 4d602e357..97e9c38ef 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 6401c872c..216d67da0 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 d7b025481..701aa021f 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 dd97acaaa..92a8baef1 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 edd31494d..0f9628540 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 8758ce8b3..c40e82df6 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 7f60a658b..f9518c1b7 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 d59f47214..2fc39839c 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 20edf61ce..79182b3be 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 2c90c54fb..e86697499 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 8d7495d43..bef0e15dc 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 fd269ba5f..55f4ee203 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 19d74e9e0..678003858 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 54356b479..c8161a755 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 86e8471c1..8e69ef2cb 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 2b5f2d5b8..48f78ebcd 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 ccaf90592..526ebb76f 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 5b3eab9f2..86e572eb4 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 b8354bf6e..d73e6e7bc 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 934fb9670..8ef13928a 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 2020ff3bc..c71a0b123 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 8ceff4401..9e47d17cb 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 66399f5e2..7667b3cc9 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 4752dc5f6..cd7895dd4 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 85549b028..d33dd2b17 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 7287717f7..2bf6b395d 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 e42e7fe0f..669989594 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 685e2c58c..6f7352b19 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 600e697f9..0abc21cd6 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 d70bb93c2..a03ce7fae 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 585c08973..3cb29b2ea 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 183e77bfa..ca3872902 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 142bc8cd5..c69de8051 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 f1789b169..23fe65455 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 e39eb2d62..b89130654 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 a9c532b53..384ea328e 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 f3068bd21..fa7596556 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 6221047d9..1e9a3a858 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 df641072b..ec41ac74a 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 ab5874b35..d074d033c 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 19169f2c2..281aded55 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/non_concurrent/acts_systemappa_test/BUILD.gn b/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn index 8951f04cc..2cb4c5548 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 d3e0551c7..84954ad9a 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/stage/actslifecyclemultihap2/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn index c939fc524..397c3d50c 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 0f8bac950..438e0460f 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 53d7853fe..84046df68 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 dab24db00..ceeeb3e4d 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 d7669636a..0a0e96f7a 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 0720cfc6b..3214ed3b1 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 33e877cd8..c95f1f4bc 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 c723cf41f..979e66f59 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 b32668739..e846967bd 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 c669685f1..c9ac8571e 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") { -- GitLab