From 1ab72c6c9830cffdf89280510704703c4af77124 Mon Sep 17 00:00:00 2001 From: xuchenghua09 Date: Thu, 8 Sep 2022 17:20:12 +0800 Subject: [PATCH] update Signed-off-by: xuchenghua09 --- .../actsappselectorpctest/BUILD.gn | 2 ++ .../actsappselectorrelyhap/BUILD.gn | 8 ++++++-- .../actsappselector/actsappselectortest/BUILD.gn | 2 ++ .../actsimageaentryrelyhap/BUILD.gn | 8 ++++---- .../actsimageafeaturerelyhap/BUILD.gn | 8 ++++---- .../actsappselector/actsimagearelyhap/BUILD.gn | 8 ++++---- .../actsimagebentryrelyhap/BUILD.gn | 8 ++++---- .../actsimagebfeaturerelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimagebrelyhap/BUILD.gn | 6 +++--- .../actsimagecentryrelyhap/BUILD.gn | 6 +++--- .../actsimagecfeaturerelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimagedrelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimageerelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimagefrelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimagegrelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimagehrelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimageirelyhap/BUILD.gn | 6 +++--- .../actsappselector/actsimagejrelyhap/BUILD.gn | 7 +++---- .../actsappselector/actsimagekrelyhap/BUILD.gn | 6 +++--- .../actsserviceabilityarelyhap/BUILD.gn | 6 +++--- .../actsserviceabilitybrelyhap/BUILD.gn | 6 +++--- .../actsappselector/actstextarelyhap/BUILD.gn | 15 ++++++++++----- .../actsappselector/actstextarelyhap/Test.json | 4 ---- .../actsappselector/actstextbrelyhap/BUILD.gn | 16 ++++++++++------ .../actsappselector/actstextbrelyhap/Test.json | 3 --- .../actsappselector/actstextcrelyhap/BUILD.gn | 16 ++++++++++------ .../actsappselector/actstextcrelyhap/Test.json | 3 --- .../actsappselector/actstextdrelyhap/BUILD.gn | 14 +++++++++----- .../actsappselector/actstextdrelyhap/Test.json | 3 --- .../actsappselector/actstexterelyhap/BUILD.gn | 14 +++++++++----- .../actsappselector/actstexterelyhap/Test.json | 3 --- .../actsappselector/actstextfrelyhap/BUILD.gn | 14 +++++++++----- .../actsappselector/actstextfrelyhap/Test.json | 3 --- .../actsappselector/actstextgrelyhap/BUILD.gn | 14 +++++++++----- .../actsappselector/actstextgrelyhap/Test.json | 3 --- .../actsappselector/actstexthrelyhap/BUILD.gn | 15 ++++++++++----- .../actsappselector/actstexthrelyhap/Test.json | 3 --- .../actsappselector/actstextirelyhap/BUILD.gn | 15 ++++++++++----- .../actsappselector/actstextirelyhap/Test.json | 3 --- .../actsappselector/actstextjrelyhap/BUILD.gn | 14 +++++++++----- .../actsappselector/actstextjrelyhap/Test.json | 3 --- .../actsappselector/actstextkrelyhap/BUILD.gn | 15 ++++++++++----- .../actsappselector/actstextkrelyhap/Test.json | 3 --- 43 files changed, 173 insertions(+), 152 deletions(-) mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsappselectorpctest/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsappselectorrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsappselectortest/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimageaentryrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagearelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagebentryrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagebrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagecentryrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagedrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimageerelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagefrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagegrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagehrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimageirelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagejrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsimagekrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/BUILD.gn mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextarelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextarelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextbrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextbrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextcrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextcrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextdrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextdrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstexterelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstexterelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextfrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextfrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextgrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextgrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstexthrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstexthrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextirelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextirelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextjrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextjrelyhap/Test.json mode change 100644 => 100755 ability/ability_runtime/actsappselector/actstextkrelyhap/BUILD.gn delete mode 100644 ability/ability_runtime/actsappselector/actstextkrelyhap/Test.json diff --git a/ability/ability_runtime/actsappselector/actsappselectorpctest/BUILD.gn b/ability/ability_runtime/actsappselector/actsappselectorpctest/BUILD.gn old mode 100644 new mode 100755 index 1d4c7c90d..050f6a8c2 --- a/ability/ability_runtime/actsappselector/actsappselectorpctest/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsappselectorpctest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAppSelectorPCTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAppSelectorPCTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsappselectorpctest_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsappselectorrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsappselectorrelyhap/BUILD.gn old mode 100644 new mode 100755 index 63c54443a..11839cba8 --- a/ability/ability_runtime/actsappselector/actsappselectorrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsappselectorrelyhap/BUILD.gn @@ -13,16 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAppSelectorRelyHap") { +ohos_hap_assist_suite("ActsAppSelectorRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" + hap_name = "ActsAppSelectorRelyHap" + + testonly = true deps = [ ":actsappselectorrelyhap_js_assets", ":actsappselectorrelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAppSelectorRelyHap" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsappselectorrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsappselectortest/BUILD.gn b/ability/ability_runtime/actsappselector/actsappselectortest/BUILD.gn old mode 100644 new mode 100755 index 757090618..08278d994 --- a/ability/ability_runtime/actsappselector/actsappselectortest/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsappselectortest/BUILD.gn @@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAppSelectorTest") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAppSelectorTest" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsappselectortest_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/BUILD.gn old mode 100644 new mode 100755 index 1582254dd..d82bab124 --- a/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimageaentryrelyhap/BUILD.gn @@ -12,13 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsImageAEntryRelyHap") { +ohos_hap_assist_suite("ActsImageAEntryRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageAEntryRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimageaentryrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageAEntryRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimageaentryrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/BUILD.gn old mode 100644 new mode 100755 index a161ac54f..f7f1783bf --- a/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/BUILD.gn @@ -12,13 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsImageAFeatureRelyHap") { +ohos_hap_assist_suite("ActsImageAFeatureRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageAFeatureRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimageafeaturerelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageAFeatureRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimageafeaturerelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagearelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagearelyhap/BUILD.gn old mode 100644 new mode 100755 index 064e12df6..cb1258c59 --- a/ability/ability_runtime/actsappselector/actsimagearelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagearelyhap/BUILD.gn @@ -12,13 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("actsimagearelyhap") { +ohos_hap_assist_suite("actsimagearelyhap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "actsimagearelyhap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagearelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("actsimagearelyhap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagearelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/BUILD.gn old mode 100644 new mode 100755 index 0a6a0dbaf..cb32d3a3c --- a/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagebentryrelyhap/BUILD.gn @@ -12,13 +12,11 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ActsImageBEntryRelyHap") { +ohos_hap_assist_suite("ActsImageBEntryRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageBEntryRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagebentryrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageBEntryRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagebentryrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/BUILD.gn old mode 100644 new mode 100755 index e834ec4e6..39402d01c --- a/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageBFeatureRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageBFeatureRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagebfeaturerelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageBFeatureRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagebfeaturerelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagebrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagebrelyhap/BUILD.gn old mode 100644 new mode 100755 index 33562beb0..506c62717 --- a/ability/ability_runtime/actsappselector/actsimagebrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagebrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageBRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageBRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagebrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageBRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagebrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/BUILD.gn old mode 100644 new mode 100755 index d0e770c1a..2d8b6ccba --- a/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagecentryrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageCEntryRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageCEntryRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagecentryrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageCEntryRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagecentryrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/BUILD.gn old mode 100644 new mode 100755 index ed5749c4f..44684e7a1 --- a/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageCFeatureRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageCFeatureRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagecfeaturerelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageCFeatureRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagecfeaturerelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagedrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagedrelyhap/BUILD.gn old mode 100644 new mode 100755 index 2a3bcc4ca..f32aa2528 --- a/ability/ability_runtime/actsappselector/actsimagedrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagedrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageDRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageDRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagedrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageDRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagedrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimageerelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimageerelyhap/BUILD.gn old mode 100644 new mode 100755 index 6736f865a..0a964fe38 --- a/ability/ability_runtime/actsappselector/actsimageerelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimageerelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageERelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageERelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimageerelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageERelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimageerelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagefrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagefrelyhap/BUILD.gn old mode 100644 new mode 100755 index 1396bf61d..b120ba6a9 --- a/ability/ability_runtime/actsappselector/actsimagefrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagefrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageFRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageFRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagefrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageFRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagefrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagegrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagegrelyhap/BUILD.gn old mode 100644 new mode 100755 index 7938197e6..93606a41f --- a/ability/ability_runtime/actsappselector/actsimagegrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagegrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageGRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageGRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagegrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageGRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagegrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagehrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagehrelyhap/BUILD.gn old mode 100644 new mode 100755 index 644efc6b8..e942713fe --- a/ability/ability_runtime/actsappselector/actsimagehrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagehrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageHRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageHRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagehrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageHRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagehrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimageirelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimageirelyhap/BUILD.gn old mode 100644 new mode 100755 index a87e2f581..ed05da8b4 --- a/ability/ability_runtime/actsappselector/actsimageirelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimageirelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageIRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageIRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimageirelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageIRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimageirelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagejrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagejrelyhap/BUILD.gn old mode 100644 new mode 100755 index c83b17b94..a63312d0c --- a/ability/ability_runtime/actsappselector/actsimagejrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagejrelyhap/BUILD.gn @@ -16,16 +16,15 @@ ohos_hap("ActsImageJRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageJRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" - testonly = true + deps = [ ":actsimagejrelyhap_js_assets", ":actsimagejrelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagejrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsimagekrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsimagekrelyhap/BUILD.gn old mode 100644 new mode 100755 index 350037e22..d7443f4cc --- a/ability/ability_runtime/actsappselector/actsimagekrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsimagekrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsImageKRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsImageKRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsimagekrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsImageKRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsimagekrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/BUILD.gn old mode 100644 new mode 100755 index d003d0fc5..cccf727ca --- a/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsServiceAbilityARelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsServiceAbilityARelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsserviceabilityarelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsServiceAbilityARelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsserviceabilityarelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/BUILD.gn old mode 100644 new mode 100755 index 043d0238e..0fd07baec --- a/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/BUILD.gn @@ -16,9 +16,7 @@ ohos_hap("ActsServiceAbilityBRelyHap") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" hap_name = "ActsServiceAbilityBRelyHap" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsserviceabilitybrelyhap_js_assets", @@ -26,6 +24,8 @@ ohos_hap("ActsServiceAbilityBRelyHap") { ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" + subsystem_name = "ability" + part_name = "ability_runtime" } ohos_app_scope("actsserviceabilitybrelyhap_app_profile") { diff --git a/ability/ability_runtime/actsappselector/actstextarelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextarelyhap/BUILD.gn old mode 100644 new mode 100755 index 3ed5b62c7..2f129f022 --- a/ability/ability_runtime/actsappselector/actstextarelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextarelyhap/BUILD.gn @@ -10,22 +10,27 @@ # 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("ActstextARelyHap") { +ohos_hap_assist_suite("ActstextARelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":actstextarelyhap_assets", - ":actstextarelyhap_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextARelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("actstextarelyhap_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("actstextarelyhap_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/actsappselector/actstextarelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextarelyhap/Test.json deleted file mode 100644 index 0ce77b309..000000000 --- a/ability/ability_runtime/actsappselector/actstextarelyhap/Test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} - diff --git a/ability/ability_runtime/actsappselector/actstextbrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextbrelyhap/BUILD.gn old mode 100644 new mode 100755 index 41c8227ea..a510af7a4 --- a/ability/ability_runtime/actsappselector/actstextbrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextbrelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextBRelyHap") { +ohos_hap_assist_suite("ActstextBRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextBRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" -} +} \ No newline at end of file diff --git a/ability/ability_runtime/actsappselector/actstextbrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextbrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextbrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextcrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextcrelyhap/BUILD.gn old mode 100644 new mode 100755 index bd3353e9a..0b2d4068b --- a/ability/ability_runtime/actsappselector/actstextcrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextcrelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextCRelyHap") { +ohos_hap_assist_suite("ActstextCRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextCRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" -} +} \ No newline at end of file diff --git a/ability/ability_runtime/actsappselector/actstextcrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextcrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextcrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextdrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextdrelyhap/BUILD.gn old mode 100644 new mode 100755 index 53914fc6f..7e5520c64 --- a/ability/ability_runtime/actsappselector/actstextdrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextdrelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextDRelyHap") { +ohos_hap_assist_suite("ActstextDRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextDRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/actsappselector/actstextdrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextdrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextdrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstexterelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstexterelyhap/BUILD.gn old mode 100644 new mode 100755 index 7e6222d3b..83376d2cd --- a/ability/ability_runtime/actsappselector/actstexterelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstexterelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextERelyHap") { +ohos_hap_assist_suite("ActstextERelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextERelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/actsappselector/actstexterelyhap/Test.json b/ability/ability_runtime/actsappselector/actstexterelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstexterelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextfrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextfrelyhap/BUILD.gn old mode 100644 new mode 100755 index 705083445..08ba99bb2 --- a/ability/ability_runtime/actsappselector/actstextfrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextfrelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextFRelyHap") { +ohos_hap_assist_suite("ActstextFRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextFRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/actsappselector/actstextfrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextfrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextfrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextgrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextgrelyhap/BUILD.gn old mode 100644 new mode 100755 index 9daab9fb6..1fba8dbe9 --- a/ability/ability_runtime/actsappselector/actstextgrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextgrelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextGRelyHap") { +ohos_hap_assist_suite("ActstextGRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextGRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/actsappselector/actstextgrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextgrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextgrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstexthrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstexthrelyhap/BUILD.gn old mode 100644 new mode 100755 index cb5dc0c8b..a3008a8a1 --- a/ability/ability_runtime/actsappselector/actstexthrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstexthrelyhap/BUILD.gn @@ -12,20 +12,25 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextHRelyHap") { +ohos_hap_assist_suite("ActstextHRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextHRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } + diff --git a/ability/ability_runtime/actsappselector/actstexthrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstexthrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstexthrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextirelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextirelyhap/BUILD.gn old mode 100644 new mode 100755 index 5d4e43346..3313a7b25 --- a/ability/ability_runtime/actsappselector/actstextirelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextirelyhap/BUILD.gn @@ -12,20 +12,25 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextIRelyHap") { +ohos_hap_assist_suite("ActstextIRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextIRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } + diff --git a/ability/ability_runtime/actsappselector/actstextirelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextirelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextirelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextjrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextjrelyhap/BUILD.gn old mode 100644 new mode 100755 index 63c1e5a63..d940b3011 --- a/ability/ability_runtime/actsappselector/actstextjrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextjrelyhap/BUILD.gn @@ -12,20 +12,24 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextJRelyHap") { +ohos_hap_assist_suite("ActstextJRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextJRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/actsappselector/actstextjrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextjrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextjrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} diff --git a/ability/ability_runtime/actsappselector/actstextkrelyhap/BUILD.gn b/ability/ability_runtime/actsappselector/actstextkrelyhap/BUILD.gn old mode 100644 new mode 100755 index fb2445134..b1c5f287f --- a/ability/ability_runtime/actsappselector/actstextkrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsappselector/actstextkrelyhap/BUILD.gn @@ -12,20 +12,25 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActstextKRelyHap") { +ohos_hap_assist_suite("ActstextKRelyHap") { hap_profile = "./entry/src/main/config.json" deps = [ - ":hjs_demo_ets_assets", - ":hjs_demo_ets_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "ActstextKRelyHap" + js_build_mode = "debug" + testonly = true + subsystem_name = "ability" + part_name = "ability_runtime" } -ohos_js_assets("hjs_demo_ets_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("hjs_demo_ets_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } + diff --git a/ability/ability_runtime/actsappselector/actstextkrelyhap/Test.json b/ability/ability_runtime/actsappselector/actstextkrelyhap/Test.json deleted file mode 100644 index 43e5d7f30..000000000 --- a/ability/ability_runtime/actsappselector/actstextkrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for aceceshi Tests" -} -- GitLab