提交 660f1620 编写于 作者: O openharmony_ci 提交者: Gitee

!1354 【社区主干】L2_MASTER_XTS_HAP包_名称规范整改

Merge pull request !1354 from jiyong/master
...@@ -18,24 +18,24 @@ group("aafwk_standard") { ...@@ -18,24 +18,24 @@ group("aafwk_standard") {
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"abilitymanager:actsabilitymanagertest", "abilitymanager:actsabilitymanagertest",
"amsabilitymanager/amsMissionSnapshotTest:amsMissionSnapshotTest", "amsabilitymanager/amsMissionSnapshotTest:ActsAmsMissionSnapshotTest",
"amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton", "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton",
"amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS", "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS",
"amsdatauriutils:amsDataUriUtils", "amsdatauriutils:ActsAmsDataUriUtilsTest",
"amszipfileunzipfilest:amsZipfileUnzipfileST", "amszipfileunzipfilest:ActsAmsZipfileUnzipfileSTest",
"context:context", "context:context",
"featureability:featureability", "featureability:featureability",
"formmanager:formmanager", "formmanager:formmanager",
#"fwkdataaccessor:FWKDataAccessor", #"fwkdataaccessor:ActsFWKDataAccessorTest",
#"serviceability/actsparticleabilitytest:ActsParticleAbilityTest", #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
"serviceability/sceneProject/particlestartability:ParticleStartAbility", "serviceability/sceneProject/particlestartability:ParticleStartAbility",
"serviceability/sceneProject/particletestserver:ParticleTestServer", "serviceability/sceneProject/particletestserver:ParticleTestServer",
#"serviceability/stserviceabilityclient:amsStServiceAbilityClient", #"serviceability/stserviceabilityclient:ActsAmsStServiceAbilityClientTest",
"serviceability/stserviceabilityserver:amsStServiceAilityServer", "serviceability/stserviceabilityserver:amsStServiceAilityServer",
"serviceability/stserviceabilityserversecond:amsStServiceAilityServerSecond", "serviceability/stserviceabilityserversecond:ActsAmsStServiceAilityServerSecondTest",
"setshowonlockscreen:setshowonlockscreen", "setshowonlockscreen:setshowonlockscreen",
#"verifypermission:verifypermission", #"verifypermission:verifypermission",
......
...@@ -27,8 +27,8 @@ group("actsabilitymanagertest") { ...@@ -27,8 +27,8 @@ group("actsabilitymanagertest") {
"actsamstestfourthscene:ActsAmsTestFourthSceneTest", "actsamstestfourthscene:ActsAmsTestFourthSceneTest",
"actsamstestsecondscene:ActsAmsTestSecondSceneTest", "actsamstestsecondscene:ActsAmsTestSecondSceneTest",
"actsamstestthirdscene:ActsAmsTestThirdSceneTest", "actsamstestthirdscene:ActsAmsTestThirdSceneTest",
"clearmissionscallback:ClearMissionsCallBack", "clearmissionscallback:ActsClearMissionsCallBackTest",
"clearmissionspromise:ClearMissionsPromise", "clearmissionspromise:ActsClearMissionsPromiseTest",
"sceneProject/simulateEAbility:simulateEAbility", "sceneProject/simulateEAbility:simulateEAbility",
"sceneProject/simulateFAbilityFir:simulateFAbilityFir", "sceneProject/simulateFAbilityFir:simulateFAbilityFir",
"sceneProject/simulateFAbilitySed:simulateFAbilitySed", "sceneProject/simulateFAbilitySed:simulateFAbilitySed",
......
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ClearMissionsCallBack") { ohos_js_hap_suite("ActsClearMissionsCallBackTest") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/systemui.p7b" certificate_profile = "./signature/systemui.p7b"
hap_name = "ClearMissionsCallBack" hap_name = "ActsClearMissionsCallBackTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ClearMissionsCallBack.hap", "ActsClearMissionsCallBackTest.hap",
"verifyIAbility.hap" "verifyIAbility.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ClearMissionsPromise") { ohos_js_hap_suite("ActsClearMissionsPromiseTest") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/systemui.p7b" certificate_profile = "./signature/systemui.p7b"
hap_name = "ClearMissionsPromise" hap_name = "ActsClearMissionsPromiseTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ClearMissionsPromise.hap", "ActsClearMissionsPromiseTest.hap",
"verifyIAbility.hap" "verifyIAbility.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("amsMissionSnapshotTest") { ohos_js_hap_suite("ActsAmsMissionSnapshotTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "amsMissionSnapshotTest" hap_name = "ActsAmsMissionSnapshotTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("amsDataUriUtils") { ohos_js_hap_suite("ActsAmsDataUriUtilsTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "amsDataUriUtils" hap_name = "ActsAmsDataUriUtilsTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"amsDataUriUtils.hap" "ActsAmsDataUriUtilsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("amsZipfileUnzipfileST") { ohos_js_hap_suite("ActsAmsZipfileUnzipfileSTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "amsZipfileUnzipfileST" hap_name = "ActsAmsZipfileUnzipfileSTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"amsZipfileUnzipfileST.hap" "ActsAmsZipfileUnzipfileSTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("FWKDataAccessor") { ohos_js_hap_suite("ActsFWKDataAccessorTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "FWKDataAccessor" hap_name = "ActsFWKDataAccessorTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"FWKDataAccessor.hap", "ActsFWKDataAccessorTest.hap",
"./resource/appexecfwk/amsStDataAbility.hap" "./resource/appexecfwk/amsStDataAbility.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("amsStServiceAbilityClient") { ohos_js_hap_suite("ActsAmsStServiceAbilityClientTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "amsStServiceAbilityClient" hap_name = "ActsAmsStServiceAbilityClientTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"amsStServiceAbilityClient.hap", "ActsAmsStServiceAbilityClientTest.hap",
"amsStServiceAilityServer.hap" "amsStServiceAilityServer.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_hap("amsStServiceAilityServerSecond") { ohos_hap("ActsAmsStServiceAilityServerSecondTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
hap_name = "amsStServiceAilityServerSecond" hap_name = "ActsAmsStServiceAilityServerSecondTest"
subsystem_name = XTS_SUITENAME subsystem_name = XTS_SUITENAME
final_hap_path = final_hap_path =
"${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
......
...@@ -17,8 +17,8 @@ group("setshowonlockscreen") { ...@@ -17,8 +17,8 @@ group("setshowonlockscreen") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"setshowonlock:setshowonlock", "setshowonlock:ActsSetshowonlockTest",
"showsethown:showsethown", "showsethown:ActsShowsethownTest",
] ]
} }
} }
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("setshowonlock") { ohos_js_hap_suite("ActsSetshowonlockTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "setshowonlock" hap_name = "ActsSetshowonlockTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("showsethown") { ohos_js_hap_suite("ActsShowsethownTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "showsethown" hap_name = "ActsShowsethownTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("AmsJsStMain") { ohos_js_hap_suite("ActsAmsJsStMainTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "AmsJsStMain" hap_name = "ActsAmsJsStMainTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("AmsJsStSubPermission") { ohos_js_hap_suite("ActsAmsJsStSubPermissionTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "AmsJsStSubPermission" hap_name = "ActsAmsJsStSubPermissionTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -17,8 +17,8 @@ group("verifypermission") { ...@@ -17,8 +17,8 @@ group("verifypermission") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"AmsJsStMain:AmsJsStMain", "AmsJsStMain:ActsAmsJsStMainTest",
"AmsJsStSubPermission:AmsJsStSubPermission", "AmsJsStSubPermission:ActsAmsJsStSubPermissionTest",
] ]
} }
} }
...@@ -16,7 +16,7 @@ group("account") { ...@@ -16,7 +16,7 @@ group("account") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"OsAccountTest_js:osaccount_js_test", "OsAccountTest_js:ActsOsAccountJSApiTest",
"appaccount:appaccount_hap", "appaccount:appaccount_hap",
] ]
} else { } else {
......
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("osaccount_js_test") {
ohos_js_hap_suite("ActsOsAccountJSApiTest") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":osaccount_js_assets", ":osaccount_js_assets",
":osaccount_resources", ":osaccount_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "OsAccountJSApiTest" hap_name = "ActsOsAccountJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("osaccount_js_assets") { ohos_js_assets("osaccount_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"OsAccountJSApiTest.hap" "ActsOsAccountJSApiTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -18,8 +18,8 @@ group("appaccount_hap") { ...@@ -18,8 +18,8 @@ group("appaccount_hap") {
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"actsaccounttest:ActsAccountTest", "actsaccounttest:ActsAccountTest",
"actsgetallaccounts:ActsGetAllAccounts", "actsgetallaccounts:ActsGetAllAccountsTest",
"actssetchecksyncenable:ActsSetCheckSyncEnable", "actssetchecksyncenable:ActsSetCheckSyncEnableTest",
"getallaccessibleaccounts:accessibleaccounts", "getallaccessibleaccounts:accessibleaccounts",
"sceneProject:appaccount_scene", "sceneProject:appaccount_scene",
] ]
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsGetAllAccounts") { ohos_js_hap_suite("ActsGetAllAccountsTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsGetAllAccounts" hap_name = "ActsGetAllAccountsTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsGetAllAccounts.hap", "ActsGetAllAccountsTest.hap",
"ActsSceneGetAllAccounts.hap" "ActsSceneGetAllAccounts.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsSetCheckSyncEnable") { ohos_js_hap_suite("ActsSetCheckSyncEnableTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsSetCheckSyncEnable" hap_name = "ActsSetCheckSyncEnableTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsSetCheckSyncEnable.hap" "ActsSetCheckSyncEnableTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -17,8 +17,8 @@ group("accessibleaccounts") { ...@@ -17,8 +17,8 @@ group("accessibleaccounts") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"actsgetallaccessibleaccounts:ActsGetAllAccessibleAccounts", "actsgetallaccessibleaccounts:ActsGetAllAccessibleAccountsTest",
"actsgetallaccessiblemultiple:ActsGetAllAccessibleMultiple", "actsgetallaccessiblemultiple:ActsGetAllAccessibleMultipleTest",
] ]
} }
} }
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsGetAllAccessibleAccounts") { ohos_js_hap_suite("ActsGetAllAccessibleAccountsTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsGetAllAccessibleAccounts" hap_name = "ActsGetAllAccessibleAccountsTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsGetAllAccessibleAccounts.hap", "ActsGetAllAccessibleAccountsTest.hap",
"ActsAccountSceneAccessible.hap" "ActsAccountSceneAccessible.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsGetAllAccessibleMultiple") { ohos_js_hap_suite("ActsGetAllAccessibleMultipleTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsGetAllAccessibleMultiple" hap_name = "ActsGetAllAccessibleMultipleTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsGetAllAccessibleMultiple.hap", "ActsGetAllAccessibleMultipleTest.hap",
"ActsAccountAccessibleFirst.hap", "ActsAccountAccessibleFirst.hap",
"ActsAccountAccessibleSecond.hap" "ActsAccountAccessibleSecond.hap"
], ],
......
...@@ -13,7 +13,5 @@ ...@@ -13,7 +13,5 @@
group("ace") { group("ace") {
testonly = true testonly = true
deps = [ deps = [ "ace_standard:ace_standard_test" ]
"ace_standard:ace_standard_test",
]
} }
...@@ -11,22 +11,16 @@ ...@@ -11,22 +11,16 @@
# See the License for the specific language governing permissions and # 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") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ace_standard_test") { ohos_js_hap_suite("ace_standard_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":ace_js_assets", ":ace_js_assets",
":ace_resources", ":ace_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ace_standard" hap_name = "ActsAceStandardTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("ace_js_assets") { ohos_js_assets("ace_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ace_standard.hap" "ActsAceStandardTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") { ...@@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") {
ldflags = [ ldflags = [
"-lstdc++", "-lstdc++",
"-ldl", "-ldl",
"-lpthread",] "-lpthread",
]
} }
...@@ -27,9 +27,9 @@ group("bundlemanager") { ...@@ -27,9 +27,9 @@ group("bundlemanager") {
"actsbmsmetadatatest:ActsBmsMetaDataTest", "actsbmsmetadatatest:ActsBmsMetaDataTest",
"actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest", "actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest",
"actsbundlemanagertest:ActsBundleManagerTest", "actsbundlemanagertest:ActsBundleManagerTest",
"actsbundlemanageruninstall:ActsBundleManagerUninstall", "actsbundlemanageruninstall:ActsBundleManagerUninstallTest",
# "bmscheckpermissiontest:BmsCheckPermissionTest", # "bmscheckpermissiontest:ActsBmsCheckPermissionTest",
"sceneProject/bmsgetinfosfifthscene:bmsThirdBundleTest5", "sceneProject/bmsgetinfosfifthscene:bmsThirdBundleTest5",
"sceneProject/bmsgetinfosfirstscene:bmsThirdBundleTest1", "sceneProject/bmsgetinfosfirstscene:bmsThirdBundleTest1",
"sceneProject/bmsgetinfosfirstsceneupdate:bmsThirdBundleTestA1", "sceneProject/bmsgetinfosfirstsceneupdate:bmsThirdBundleTestA1",
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ActsBundleManagerUninstall") { ohos_js_hap_suite("ActsBundleManagerUninstallTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsBundleManagerUninstall" hap_name = "ActsBundleManagerUninstallTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsBundleManagerUninstall.hap" "ActsBundleManagerUninstallTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("BmsCheckPermissionTest") { ohos_js_hap_suite("ActsBmsCheckPermissionTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "BmsCheckPermissionTest" hap_name = "ActsBmsCheckPermissionTest"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -12,16 +12,15 @@ ...@@ -12,16 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ipcrpcService") { ohos_js_hap_suite("ipcrpcService") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":ipcrpcService_assets", ":ipcrpcService_assets",
":ipcrpcService_resources", ":ipcrpcService_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsIpcRpcServiceTest"
hap_name = "IpcRpcService"
} }
ohos_js_assets("ipcrpcService_assets") { ohos_js_assets("ipcrpcService_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"IpcRpcService.hap" "ActsIpcRpcServiceTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -12,16 +12,15 @@ ...@@ -12,16 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("ipcrpcTest") { ohos_js_hap_suite("ipcrpcTest") {
hap_profile = "./entry/src/main/config.json" hap_profile = "./entry/src/main/config.json"
deps = [ deps = [
":ipcrpcTest_assets", ":ipcrpcTest_assets",
":ipcrpcTest_resources", ":ipcrpcTest_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsIpcRpcTest"
hap_name = "IpcRpcTest"
} }
ohos_js_assets("ipcrpcTest_assets") { ohos_js_assets("ipcrpcTest_assets") {
source_dir = "./entry/src/main/js/default" source_dir = "./entry/src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"IpcRpcTest.hap", "ActsIpcRpcTest.hap",
"IpcRpcService.hap" "IpcRpcService.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
......
...@@ -12,22 +12,15 @@ ...@@ -12,22 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("wifi_standard_test") { ohos_js_hap_suite("wifi_standard_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":wifi_js_assets", ":wifi_js_assets",
":wifi_resources", ":wifi_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "WifiJSApiTest" hap_name = "ActsWifiJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("wifi_js_assets") { ohos_js_assets("wifi_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"WifiJSApiTest.hap" "ActsWifiJSApiTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -12,22 +12,15 @@ ...@@ -12,22 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("process_js_test") { ohos_js_hap_suite("process_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":process_js_assets", ":process_js_assets",
":process_resources", ":process_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ProcessJSApiTest" hap_name = "ActsProcessJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("process_js_assets") { ohos_js_assets("process_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ProcessJSApiTest.hap" "ActsProcessJSApiTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -12,22 +12,15 @@ ...@@ -12,22 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("url_js_test") { ohos_js_hap_suite("url_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":url_js_assets", ":url_js_assets",
":url_resources", ":url_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "UrlJsTest" hap_name = "ActsUrlJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("url_js_assets") { ohos_js_assets("url_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"UrlJsTest.hap" "ActsUrlJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -12,22 +12,15 @@ ...@@ -12,22 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("util_js_test") { ohos_js_hap_suite("util_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":util_js_assets", ":util_js_assets",
":util_resources", ":util_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "UtilJsTest" hap_name = "ActsUtilJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("util_js_assets") { ohos_js_assets("util_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"UtilJsTest.hap" "ActsUtilJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -12,22 +12,15 @@ ...@@ -12,22 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("worker_js_hap") { ohos_js_hap_suite("worker_js_hap") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":worker_js_assets", ":worker_js_assets",
":worker_resources", ":worker_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "WorkerJSTest" hap_name = "ActsWorkerJSTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("worker_js_assets") { ohos_js_assets("worker_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"WorkerJSTest.hap" "ActsWorkerJSTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -16,8 +16,6 @@ import("//build/ohos_var.gni") ...@@ -16,8 +16,6 @@ import("//build/ohos_var.gni")
group("demo") { group("demo") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [ "hjsunit_sample:hjs_demo_test" ]
"hjsunit_sample:hjs_demo_test",
]
} }
} }
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("hjs_demo_test") { ohos_js_hap_suite("hjs_demo_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":hjs_demo_js_assets", ":hjs_demo_js_assets",
":hjs_demo_resources", ":hjs_demo_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "Hjsdemotest" hap_name = "Hjsdemotest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("hjs_demo_js_assets") { ohos_js_assets("hjs_demo_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -17,14 +17,14 @@ import("../../../../../developtools/profiler/device/base/config.gni") ...@@ -17,14 +17,14 @@ import("../../../../../developtools/profiler/device/base/config.gni")
############################################################################### ###############################################################################
config("module_private_config") { config("module_private_config") {
visibility = [":*"] visibility = [ ":*" ]
} }
ohos_moduletest_suite("hipluginmoduleapitest") { ohos_moduletest_suite("hipluginmoduleapitest") {
deps = [ deps = [
"//third_party/googletest:gtest",
"${OHOS_PROFILER_DIR}/protos/types/plugins/memory_data:memory_data_cpp",
"${OHOS_PROFILER_DIR}/device/plugins/memory_plugin:memdataplugin", "${OHOS_PROFILER_DIR}/device/plugins/memory_plugin:memdataplugin",
"${OHOS_PROFILER_DIR}/protos/types/plugins/memory_data:memory_data_cpp",
"//third_party/googletest:gtest",
] ]
include_dirs = [ include_dirs = [
"${OHOS_PROFILER_DIR}/interfaces/kits/", "${OHOS_PROFILER_DIR}/interfaces/kits/",
...@@ -44,9 +44,7 @@ ohos_moduletest_suite("hipluginmoduleapitest") { ...@@ -44,9 +44,7 @@ ohos_moduletest_suite("hipluginmoduleapitest") {
"-Wno-inconsistent-missing-override", "-Wno-inconsistent-missing-override",
"-Dprivate=public", #allow test code access private members "-Dprivate=public", #allow test code access private members
] ]
external_deps = [ external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
"hiviewdfx_hilog_native:libhilog",
]
subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}"
defines = [ "HAVE_HILOG", ] defines = [ "HAVE_HILOG" ]
} }
...@@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") { ...@@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") {
deps = [ deps = [
"${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle",
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
"//foundation/distributedschedule/samgr_lite/samgr:samgr",
"//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr", "//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr",
"//foundation/distributedschedule/samgr_lite/samgr:samgr",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
......
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("appdatamgr_js_test") { ohos_js_hap_suite("appdatamgr_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":appdatamgr_js_assets", ":appdatamgr_js_assets",
":appdatamgr_resources", ":appdatamgr_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "AppdatamagrJsTest" hap_name = "ActsAppdatamagrJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("appdatamgr_js_assets") { ohos_js_assets("appdatamgr_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"AppdatamagrJsTest.hap" "ActsAppdatamagrJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("distributeddatamgr_js_test") { ohos_js_hap_suite("distributeddatamgr_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":distributeddatamgr_js_assets", ":distributeddatamgr_js_assets",
":distributeddatamgr_resources", ":distributeddatamgr_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "DistributeddatamgrJsTest" hap_name = "ActsDistributedDatamgrJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("distributeddatamgr_js_assets") { ohos_js_assets("distributeddatamgr_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"DistributeddatamgrJsTest.hap" "ActsDistributedDatamgrJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("devicemanager_js_test") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("devicemanager_js_test") {
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "devicemanagerjstest" hap_name = "ActsDeviceManagerJsTest"
} }
ohos_js_assets("devicemanager_js_assets") { ohos_js_assets("devicemanager_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"devicemanagerjstest.hap" "ActsDeviceManagerJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -18,7 +18,7 @@ group("global") { ...@@ -18,7 +18,7 @@ group("global") {
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"i18n_standard/intljs:intljs_test", "i18n_standard/intljs:intljs_test",
"i18n_standard/zone/src:ZoneUtiltest", "i18n_standard/zone/src:ActsZoneUtilTest",
"resmgr_standard/resmgrjs:resmgrjs_test", "resmgr_standard/resmgrjs:resmgrjs_test",
] ]
} else { } else {
......
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("intljs_test") { ohos_js_hap_suite("intljs_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":intljs_assets", ":intljs_assets",
":intljs_resources", ":intljs_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "IntlJsTest" hap_name = "ActsIntlJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("intljs_assets") { ohos_js_assets("intljs_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"IntlJsTest.hap" "ActsIntlJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni") ...@@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni")
#SUBSYSTEM_DIR = "//base/global" #SUBSYSTEM_DIR = "//base/global"
module_output_path = "hit/global" module_output_path = "hit/global"
ohos_moduletest_suite("ZoneUtiltest") { ohos_moduletest_suite("ActsZoneUtilTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"ZoneUtiltest->/data/local/tmp/ZoneUtiltest" "ActsZoneUtilTest->/data/local/tmp/ActsZoneUtilTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "ZoneUtiltest", "module-name": "ActsZoneUtilTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for ZoneUtiltest Tests" "description": "Configuration for ActsZoneUtilTest Tests"
} }
\ No newline at end of file
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("resmgrjs_test") { ohos_js_hap_suite("resmgrjs_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":resmgrjs_assets", ":resmgrjs_assets",
":resmgrjs_resources", ":resmgrjs_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "resmgrjs" hap_name = "ActsResMgrJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("resmgrjs_assets") { ohos_js_assets("resmgrjs_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"resmgrjs.hap" "ActsResMgrJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
group("ActsGlobalTest") { group("ActsGlobalTest") {
deps = [ deps = [
"//test/xts/acts/global_lite/i18n_lite/number_posix:ActsNumberTest",
"//test/xts/acts/global_lite/i18n_lite/numberrecall_posix:ActsNumberRecallTest",
"//test/xts/acts/global_lite/i18n_lite/datetime_posix:ActsGlobalDateTimeTest", "//test/xts/acts/global_lite/i18n_lite/datetime_posix:ActsGlobalDateTimeTest",
"//test/xts/acts/global_lite/i18n_lite/datetimerecall_posix:ActsGlobalDateTimeRecallTest", "//test/xts/acts/global_lite/i18n_lite/datetimerecall_posix:ActsGlobalDateTimeRecallTest",
"//test/xts/acts/global_lite/i18n_lite/number_posix:ActsNumberTest",
"//test/xts/acts/global_lite/i18n_lite/numberrecall_posix:ActsNumberRecallTest",
"//test/xts/acts/global_lite/i18n_lite/week_plural_number/src:WeekPluralNumbertest", "//test/xts/acts/global_lite/i18n_lite/week_plural_number/src:WeekPluralNumbertest",
# depend on the resources # depend on the resources
......
...@@ -20,7 +20,6 @@ hcpptest_suite("WeekPluralNumbertest") { ...@@ -20,7 +20,6 @@ hcpptest_suite("WeekPluralNumbertest") {
include_dirs = [ include_dirs = [
"//base/global/i18n_lite/interfaces/kits/i18n/include", "//base/global/i18n_lite/interfaces/kits/i18n/include",
"//third_party/bounds_checking_function/include", "//third_party/bounds_checking_function/include",
] ]
deps = [ deps = [
......
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("window_hap_test") { ohos_js_hap_suite("window_hap_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":window_js_assets", ":window_js_assets",
":window_resources", ":window_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "windowhaptest" hap_name = "ActsWindowHapTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("window_js_assets") { ohos_js_assets("window_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"windowhaptest.hap" "ActsWindowHapTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -15,10 +15,10 @@ group("hdfacttest") { ...@@ -15,10 +15,10 @@ group("hdfacttest") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
#"audio:hdf_xtstest_audio", #"audio:ActsHdfXtstestAudioTest",
"input:hdf_xtstest_input", "input:ActsHdfXtstestInputTest",
"sensor:hdf_xtstest_sensor", "sensor:ActsHdfXtstestSensorTest",
"wlan/wifi:hdf_xtstest_wifi", "wlan/wifi:ActsHdfXtstestWifiTest",
] ]
} }
} }
...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni") ...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
#################################group######################################### #################################group#########################################
group("hdf_xtstest_audio") { group("ActsHdfXtstestAudioTest") {
if (!defined(ohos_lite)) { if (!defined(ohos_lite)) {
testonly = true testonly = true
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"hdf_xtstest_audio->/data/local/tmp/hdf_xtstest_audio" "ActsHdfXtstestAudioTest->/data/local/tmp/ActsHdfXtstestAudioTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni") ...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
module_output_path = "hdf/input" module_output_path = "hdf/input"
ohos_moduletest_suite("hdf_xtstest_input") { ohos_moduletest_suite("ActsHdfXtstestInputTest") {
module_out_path = module_output_path module_out_path = module_output_path
include_dirs = [ include_dirs = [
"//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/include",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"hdf_xtstest_input->/data/local/tmp/hdf_xtstest_input" "ActsHdfXtstestInputTest->/data/local/tmp/ActsHdfXtstestInputTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni") ...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
module_output_path = "hdf/sensor" module_output_path = "hdf/sensor"
ohos_moduletest_suite("hdf_xtstest_sensor") { ohos_moduletest_suite("ActsHdfXtstestSensorTest") {
module_out_path = module_output_path module_out_path = module_output_path
include_dirs = [] include_dirs = []
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"hdf_xtstest_sensor->/data/local/tmp/hdf_xtstest_sensor" "ActsHdfXtstestSensorTest->/data/local/tmp/ActsHdfXtstestSensorTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni") ...@@ -16,7 +16,7 @@ import("//drivers/adapter/uhdf2/uhdf.gni")
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
module_output_path = "hdf/wlan" module_output_path = "hdf/wlan"
ohos_moduletest_suite("hdf_xtstest_wifi") { ohos_moduletest_suite("ActsHdfXtstestWifiTest") {
module_out_path = module_output_path module_out_path = module_output_path
include_dirs = [ include_dirs = [
"//drivers/framework/test/unittest/include", "//drivers/framework/test/unittest/include",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"hdf_xtstest_wifi->/data/local/tmp/hdf_xtstest_wifi" "ActsHdfXtstestWifiTest->/data/local/tmp/ActsHdfXtstestWifiTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
...@@ -15,13 +15,13 @@ group("hiviewdfxtestacts") { ...@@ -15,13 +15,13 @@ group("hiviewdfxtestacts") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"faultloggertest/faultloggercpptest:faultloggertest", "faultloggertest/faultloggercpptest:ActsFaultLoggerTest",
"hiappeventtest/hiappeventjstest:hiappeventjstest", "hiappeventtest/hiappeventjstest:ActsHiAppEventJsTest",
"hicollietest/hicolliecpptest:HiCollieCppTest", "hicollietest/hicolliecpptest:ActsHiCollieCppTest",
"hilogtest/libhilogtest:libhilogtestacts", "hilogtest/libhilogtest:libhilogtestacts",
"hisyseventtest/hisyseventcpptest:HiSysEventCPPTest", "hisyseventtest/hisyseventcpptest:ActsHiSysEventCPPTest",
"hitracetest/hitracecpptest:HitraceCPPtest", "hitracetest/hitracecpptest:ActsHitraceCPPTest",
"hitracetest/hitracectest:HitraceCtest", "hitracetest/hitracectest:ActsHitraceCTest",
] ]
} }
} }
...@@ -24,7 +24,7 @@ config("faultloggertest_config") { ...@@ -24,7 +24,7 @@ config("faultloggertest_config") {
"genfault.h", "genfault.h",
] ]
} }
ohos_moduletest_suite("faultloggertest") { ohos_moduletest_suite("ActsFaultLoggerTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"faultloggertest.cpp", "faultloggertest.cpp",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"faultloggertest->/data/local/tmp/faultloggertest" "ActsFaultLoggerTest->/data/local/tmp/ActsFaultLoggerTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
...@@ -12,20 +12,15 @@ ...@@ -12,20 +12,15 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("hiappeventjstest") {
ohos_js_hap_suite("ActsHiAppEventJsTest") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":hiappevent_js_assets", ":hiappevent_js_assets",
":hiappevent_resources", ":hiappevent_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "HiAppeventTest" hap_name = "ActsHiAppEventJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("hiappevent_js_assets") { ohos_js_assets("hiappevent_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"HiAppeventTest.hap" "ActsHiAppEventJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -24,7 +24,7 @@ config("xcollie_config") { ...@@ -24,7 +24,7 @@ config("xcollie_config") {
"//base/hiviewdfx/hicollie/interfaces/native/innerkits/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include",
] ]
} }
ohos_moduletest_suite("HiCollieCppTest") { ohos_moduletest_suite("ActsHiCollieCppTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "HiCollieCppTest.cpp" ] sources = [ "HiCollieCppTest.cpp" ]
deps = [ deps = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"HiCollieCppTest->/data/local/tmp/HiCollieCppTest" "ActsHiCollieCppTest->/data/local/tmp/ActsHiCollieCppTest"
], ],
"type": "PushKit", "type": "PushKit",
"post-push": [ "post-push": [
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
group("libhilogtestacts") { group("libhilogtestacts") {
testonly = true testonly = true
deps = [ deps = [
"hilogtest:hilogtest", "hilogtest:ActsHilogTest",
"libhilogCPPtest:LibhilogCPPtest", "libhilogCPPtest:ActsLibhilogCPPTest",
"libhilogCtest:libhilogCtest", "libhilogCtest:ActsLibhilogCTest",
] ]
} }
...@@ -23,7 +23,7 @@ config("hilogtest_config") { ...@@ -23,7 +23,7 @@ config("hilogtest_config") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
] ]
} }
ohos_moduletest_suite("hilogtest") { ohos_moduletest_suite("ActsHilogTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "hilogtest.cpp" ] sources = [ "hilogtest.cpp" ]
deps = [ deps = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"hilogtest->/data/local/tmp/hilogtest" "ActsHilogTest->/data/local/tmp/ActsHilogTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
...@@ -23,7 +23,7 @@ config("hilogtest_config") { ...@@ -23,7 +23,7 @@ config("hilogtest_config") {
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
] ]
} }
ohos_moduletest_suite("LibhilogCPPtest") { ohos_moduletest_suite("ActsLibhilogCPPTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "LibhilogCPPtest.cpp" ] sources = [ "LibhilogCPPtest.cpp" ]
deps = [ deps = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"LibhilogCPPtest->/data/local/tmp/LibhilogCPPtest" "ActsLibhilogCPPTest->/data/local/tmp/ActsLibhilogCPPTest"
], ],
"type": "PushKit" "type": "PushKit"
} }
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册