From 7a8d753d101c378916375b5e0585540f93f538c4 Mon Sep 17 00:00:00 2001 From: jiyong Date: Wed, 29 Sep 2021 21:26:14 +0800 Subject: [PATCH] jiyong@huawei.com Signed-off-by: jiyong --- .../serviceability/stserviceabilityserver/BUILD.gn | 9 ++++++--- .../badgedisplayed/localcandisplay/BUILD.gn | 9 ++++++--- .../publish_test/subscribe/publishfirst/BUILD.gn | 9 ++++++--- .../publish_test/subscribe/publishsecond/BUILD.gn | 9 ++++++--- .../publish_test/wantagent/test1/BUILD.gn | 12 ++++++++---- .../publish_test/wantagent/test2/BUILD.gn | 11 +++++++---- 6 files changed, 39 insertions(+), 20 deletions(-) diff --git a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn b/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn index 021295f29..27ecff427 100644 --- a/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn +++ b/appexecfwk/ams_standard/serviceability/stserviceabilityserver/BUILD.gn @@ -10,17 +10,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("amsStServiceAilityServer") { +ohos_hap("amsStServiceAilityServer") { hap_profile = "./entry/src/main/config.json" + hap_name = "amsStServiceAilityServer" + 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" - hap_name = "amsStServiceAilityServer" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn index 8c529148b..66dba9b9c 100644 --- a/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn +++ b/notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn @@ -10,17 +10,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsLocalCanDisplayTest") { +ohos_hap("ActsAnsLocalCanDisplayTest") { hap_profile = "./entry/src/main/config.json" + hap_name = "ActsAnsLocalCanDisplayTest" + 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" - hap_name = "ActsAnsLocalCanDisplayTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn b/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn index 9f205f333..ed28c5922 100644 --- a/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn +++ b/notification/ans_standard/publish_test/subscribe/publishfirst/BUILD.gn @@ -10,17 +10,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsPublishOneTest") { +ohos_hap("ActsAnsPublishOneTest") { hap_profile = "./entry/src/main/config.json" + hap_name = "ActsAnsPublishOneTest" + 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" - hap_name = "ActsAnsPublishOneTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn b/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn index 3136d32fd..f198bf413 100644 --- a/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn +++ b/notification/ans_standard/publish_test/subscribe/publishsecond/BUILD.gn @@ -10,17 +10,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsPublishTwoTest") { +ohos_hap("ActsAnsPublishTwoTest") { hap_profile = "./entry/src/main/config.json" + hap_name = "ActsAnsPublishTwoTest" + 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" - hap_name = "ActsAnsPublishTwoTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn b/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn index 0c86c9de6..0ebe52f0e 100644 --- a/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/test1/BUILD.gn @@ -9,18 +9,21 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. - +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("test1") { +ohos_hap("test1") { hap_profile = "./entry/src/main/config.json" + hap_name = "test1" + 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" - hap_name = "test1" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" @@ -29,3 +32,4 @@ ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/js/resources" ] hap_profile = "./entry/src/main/config.json" } + diff --git a/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn b/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn index 0dadfa1b2..2070fddac 100644 --- a/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn +++ b/notification/ans_standard/publish_test/wantagent/test2/BUILD.gn @@ -9,18 +9,21 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. - +# limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("test2") { +ohos_hap("test2") { hap_profile = "./entry/src/main/config.json" + hap_name = "test2" + 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" - hap_name = "test2" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" -- GitLab