From 9cc0b459a4bf8c139158db180a02740ae8b09a3d Mon Sep 17 00:00:00 2001 From: jiyong Date: Sat, 18 Sep 2021 11:05:40 +0800 Subject: [PATCH] jiyong@huawei.com Signed-off-by: jiyong --- .../abilitymanager/sceneProject/simulateEAbility/BUILD.gn | 3 +-- .../abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn | 3 +-- .../abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn | 3 +-- .../abilitymanager/sceneProject/verifyAAbility/BUILD.gn | 3 +-- .../abilitymanager/sceneProject/verifyIAbility/BUILD.gn | 3 +-- aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn | 2 +- .../sceneproject/finishwithresultemptytest/BUILD.gn | 2 +- .../finishwithresultpromiseparameterstest/BUILD.gn | 2 +- .../featureability/sceneproject/finishwithresulttest/BUILD.gn | 2 +- .../featureability/sceneproject/getcallingbundletest/BUILD.gn | 2 +- .../featureability/sceneproject/startability/BUILD.gn | 2 +- .../sceneproject/startabilityforresult/BUILD.gn | 2 +- .../featureability/sceneproject/terminateabilitytest/BUILD.gn | 2 +- .../want/sceneProject/actsgetwantalltesthap/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmssceneeight/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmsscenefive/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmsscenefour/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmsscenenine/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmssceneone/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmssceneseven/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmsscenesix/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmsscenethree/BUILD.gn | 2 +- .../bundlemanager/sceneProject/bmsscenetwo/BUILD.gn | 2 +- notification/ans_standard/BUILD.gn | 4 ++-- 24 files changed, 25 insertions(+), 30 deletions(-) diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn index f8ec5e5cd..d84de515c 100644 --- a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("simulateEAbility") { hap_profile = "./src/main/config.json" hap_name = "simulateEAbility" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ @@ -32,4 +32,3 @@ ohos_resources("hjs_demo_resources") { sources = [ "./src/main/js/resources" ] hap_profile = "./src/main/config.json" } - diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn index e72642437..1d2d40ba2 100644 --- a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("simulateFAbilityFir") { hap_profile = "./src/main/config.json" hap_name = "simulateFAbilityFir" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ @@ -32,4 +32,3 @@ ohos_resources("hjs_demo_resources") { sources = [ "./src/main/js/resources" ] hap_profile = "./src/main/config.json" } - diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn index 909212500..598eee6f7 100644 --- a/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("simulateFAbilitySed") { hap_profile = "./src/main/config.json" hap_name = "simulateFAbilitySed" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ @@ -32,4 +32,3 @@ ohos_resources("hjs_demo_resources") { sources = [ "./src/main/js/resources" ] hap_profile = "./src/main/config.json" } - diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn index ddb20075c..2865d9b71 100644 --- a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("verifyAAbility") { hap_profile = "./src/main/config.json" hap_name = "verifyAAbility" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ @@ -32,4 +32,3 @@ ohos_resources("hjs_demo_resources") { sources = [ "./src/main/js/resources" ] hap_profile = "./src/main/config.json" } - diff --git a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn index 66fd0a7bc..46286fa75 100644 --- a/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("verifyIAbility") { hap_profile = "./src/main/config.json" hap_name = "verifyIAbility" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ @@ -32,4 +32,3 @@ ohos_resources("hjs_demo_resources") { sources = [ "./src/main/js/resources" ] hap_profile = "./src/main/config.json" } - diff --git a/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn b/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn index a7d21ed4e..bfe7930fc 100644 --- a/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn +++ b/aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("Defpermission") { hap_profile = "./src/main/config.json" hap_name = "Defpermission" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn index a1a33b7bb..15d1a4ca2 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("FinishWithResultEmptyTest") { hap_profile = "./src/main/config.json" hap_name = "FinishWithResultEmptyTest" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn index 5d5413369..c116e62a4 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("FinishWithResultPromiseParametersTest") { hap_profile = "./src/main/config.json" hap_name = "FinishWithResultPromiseParametersTest" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn index 918a47bbd..31182aac6 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("FinishWithResultTest") { hap_profile = "./src/main/config.json" hap_name = "FinishWithResultTest" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn index 92f34b422..e0c5e4daf 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("GetCallingBundlePromiseTest") { hap_profile = "./src/main/config.json" hap_name = "GetCallingBundlePromiseTest" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn index 2d8ff5ad1..2ebfaead2 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("StartAbility") { hap_profile = "./src/main/config.json" hap_name = "StartAbility" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn index 84bcd69f6..2e9a4017c 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("StartAbilityForResult") { hap_profile = "./src/main/config.json" hap_name = "StartAbilityForResult" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn index 7e46abd6c..285c5d8f5 100644 --- a/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn +++ b/aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("TerminateAbilityTest") { hap_profile = "./src/main/config.json" hap_name = "TerminateAbilityTest" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn index ae36287cf..e0b424b3f 100644 --- a/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn +++ b/aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("ActsGetWantAllTestHap") { hap_profile = "./src/main/config.json" hap_name = "ActsGetWantAllTestHap" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn index a7042d59b..e3bbd4cee 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest8") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest8" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn index cf593867a..ded8e46f0 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest5") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest5" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn index 70a5e9b85..7881a0bad 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest4") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest4" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn index b46d1a8e0..dcca89660 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest9") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest9" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn index 05f806399..013e126a0 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest1") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest1" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn index d9da2a48f..23a52378b 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest7") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest7" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn index bbeeb6ac7..15f34948d 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest6") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest6" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn index 06d964572..07e7c48f8 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest3") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest3" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn index 15214d437..c17bfce1b 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn @@ -16,7 +16,7 @@ ohos_hap("bmsJstest2") { hap_profile = "./src/main/config.json" hap_name = "bmsJstest2" subsystem_name = XTS_SUITENAME - final_hap_path = + final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" testonly = true deps = [ diff --git a/notification/ans_standard/BUILD.gn b/notification/ans_standard/BUILD.gn index f6ca4776d..cf4d7855e 100644 --- a/notification/ans_standard/BUILD.gn +++ b/notification/ans_standard/BUILD.gn @@ -16,8 +16,8 @@ group("ans_standard") { testonly = true if (is_standard_system) { deps = [ - "cancel_test:MyApplicationCancelAll", - "publish_test:notification-ContentType-All", + "cancel_test:cancel_test", + "publish_test:publish_test", "publishicontest:ActsAnsIconTest", ] } -- GitLab