提交 f05c4373 编写于 作者: Q quxianfei

LTS_3.0 HAP's name modified

Signed-off-by: Nquxianfei <quxianfei@huawei.com>
上级 d62ac972
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("amsZipfileUnzipfileST") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("amsZipfileUnzipfileST") {
":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
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("FWKDataAccessor") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("FWKDataAccessor") {
":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",
......
...@@ -15,7 +15,7 @@ import("//build/ohos_var.gni") ...@@ -15,7 +15,7 @@ import("//build/ohos_var.gni")
group("account") { group("account") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ "OsAccountTest_js:osaccount_js_test" ] deps = [ "OsAccountTest_js:ActsOsAccountJSApiTest" ]
} else { } else {
deps = [ deps = [
"appaccount:appaccount_hap", "appaccount:appaccount_hap",
......
...@@ -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
......
...@@ -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,7 +27,7 @@ group("bundlemanager") { ...@@ -27,7 +27,7 @@ group("bundlemanager") {
#"actsbmsmetadatatest:ActsBmsMetaDataTest", #"actsbmsmetadatatest:ActsBmsMetaDataTest",
"actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest", "actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest",
"actsbundlemanagertest:ActsBundleManagerTest", "actsbundlemanagertest:ActsBundleManagerTest",
"actsbundlemanageruninstall:ActsBundleManagerUninstall", "actsbundlemanageruninstall:ActsBundleManagerUninstallTest",
"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
......
...@@ -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/",
...@@ -42,11 +42,9 @@ ohos_moduletest_suite("hipluginmoduleapitest") { ...@@ -42,11 +42,9 @@ ohos_moduletest_suite("hipluginmoduleapitest") {
cflags = [ cflags = [
"-pthread", "-pthread",
"-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 = [
"hiviewdfx_hilog_native:libhilog",
] ]
external_deps = [ "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,12 +13,12 @@ ...@@ -13,12 +13,12 @@
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
#"//test/xts/acts/global_lite/i18n_lite/resource_parse_load/src:ResourceParseLoadtest", #"//test/xts/acts/global_lite/i18n_lite/resource_parse_load/src:ResourceParseLoadtest",
] ]
......
...@@ -15,7 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") ...@@ -15,7 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
hcpptest_suite("ResourceParseLoadtest") { hcpptest_suite("ResourceParseLoadtest") {
suite_name = "acts" suite_name = "acts"
sources = [ sources = [
"global_test.cpp", "global_test.cpp",
"hap_manager_test.cpp", "hap_manager_test.cpp",
"hap_parser_test.cpp", "hap_parser_test.cpp",
...@@ -28,7 +28,7 @@ hcpptest_suite("ResourceParseLoadtest") { ...@@ -28,7 +28,7 @@ hcpptest_suite("ResourceParseLoadtest") {
"resource_manager_test.cpp", "resource_manager_test.cpp",
"string_utils_test.cpp", "string_utils_test.cpp",
"test_common.cpp", "test_common.cpp",
] ]
include_dirs = [ include_dirs = [
"//base/global/i18n_lite/interfaces/kits/i18n/include", "//base/global/i18n_lite/interfaces/kits/i18n/include",
......
...@@ -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,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"
} }
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "faultloggertest", "module-name": "ActsFaultLoggerTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for faultloggertest Tests" "description": "Configuration for ActsFaultLoggerTest 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("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": [
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "HiCollieCppTest", "module-name": "ActsHiCollieCppTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for HiCollieCppTest Tests" "description": "Configuration for ActsHiCollieCppTest Tests"
} }
\ No newline at end of file
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
group("libhilogtestacts") { group("libhilogtestacts") {
testonly = true testonly = true
deps = [ deps = [
"libhilogCPPtest:LibhilogCPPtest", "hilogtest:ActsHilogTest",
"libhilogCtest:libhilogCtest", "libhilogCPPtest:ActsLibhilogCPPTest",
"hilogtest:hilogtest", "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"
} }
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "hilogtest", "module-name": "ActsHilogTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for hilogtest Tests" "description": "Configuration for ActsHilogTest Tests"
} }
\ No newline at end of file
...@@ -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"
} }
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "LibhilogCPPtest", "module-name": "ActsLibhilogCPPTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for LibhilogCPPtest Tests" "description": "Configuration for ActsLibhilogCPPTest Tests"
} }
\ No newline at end of file
...@@ -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("libhilogCtest") { ohos_moduletest_suite("ActsLibhilogCTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "libhilogCtest.cpp" ] sources = [ "libhilogCtest.cpp" ]
deps = [ deps = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"libhilogCtest->/data/local/tmp/libhilogCtest" "ActsLibhilogCTest->/data/local/tmp/ActsLibhilogCTest"
], ],
"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": "libhilogCtest", "module-name": "ActsLibhilogCTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for libhilogCtest Tests" "description": "Configuration for ActsLibhilogCTest Tests"
} }
\ No newline at end of file
...@@ -25,11 +25,9 @@ config("hilogtest_config") { ...@@ -25,11 +25,9 @@ config("hilogtest_config") {
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include", "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include",
] ]
} }
ohos_moduletest_suite("HiSysEventCPPTest") { ohos_moduletest_suite("ActsHiSysEventCPPTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [ "HiSysEventCPPTest.cpp" ]
"HiSysEventCPPTest.cpp",
]
deps = [ deps = [
"../../utils/native:utilskit", "../../utils/native:utilskit",
"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"HiSysEventCPPTest->/data/local/tmp/HiSysEventCPPTest" "ActsHiSysEventCPPTest->/data/local/tmp/ActsHiSysEventCPPTest"
], ],
"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": "HiSysEventCPPTest", "module-name": "ActsHiSysEventCPPTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for HiSysEventCPPTest Tests" "description": "Configuration for ActsHiSysEventCPPTest Tests"
} }
\ No newline at end of file
...@@ -25,7 +25,7 @@ config("hitrace_config") { ...@@ -25,7 +25,7 @@ config("hitrace_config") {
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include", "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include",
] ]
} }
ohos_moduletest_suite("HitraceCPPtest") { ohos_moduletest_suite("ActsHitraceCPPTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "HitraceCPPtest.cpp" ] sources = [ "HitraceCPPtest.cpp" ]
deps = [ deps = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"HitraceCPPtest->/data/local/tmp/HitraceCPPtest" "ActsHitraceCPPTest->/data/local/tmp/ActsHitraceCPPTest"
], ],
"type": "PushKit", "type": "PushKit",
"post-push": [ "post-push": [
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "HitraceCPPtest", "module-name": "ActsHitraceCPPTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for HitraceCPPtest Tests" "description": "Configuration for ActsHitraceCPPTest Tests"
} }
\ No newline at end of file
...@@ -24,7 +24,7 @@ config("hitrace_config") { ...@@ -24,7 +24,7 @@ config("hitrace_config") {
"//base/hiviewdfx/hitrace/interfaces/native/innerkits/include", "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include",
] ]
} }
ohos_moduletest_suite("HitraceCtest") { ohos_moduletest_suite("ActsHitraceCTest") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ "HitraceCtest.cpp" ] sources = [ "HitraceCtest.cpp" ]
deps = [ deps = [
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"HitraceCtest->/data/local/tmp/HitraceCtest" "ActsHitraceCTest->/data/local/tmp/ActsHitraceCTest"
], ],
"type": "PushKit", "type": "PushKit",
"post-push": [ "post-push": [
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "HitraceCtest", "module-name": "ActsHitraceCTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for HitraceCtest Tests" "description": "Configuration for ActsHitraceCTest Tests"
} }
\ No newline at end of file
# Copyright (c) 2020 Huawei Device Co., Ltd. # Copyright (c) 2020 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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/lite/build/suite_lite.gni") import("//test/xts/tools/lite/build/suite_lite.gni")
hctest_suite("ActsHieventLiteTest") { hctest_suite("ActsHieventLiteTest") {
suite_name = "acts" suite_name = "acts"
sources = [ sources = [ "src/hievent_lite_test.c" ]
"src/hievent_lite_test.c",
]
include_dirs = [ include_dirs = [
"src", "src",
"//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
} }
# Copyright (c) 2020 Huawei Device Co., Ltd. # Copyright (c) 2020 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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/lite/build/suite_lite.gni") import("//test/xts/tools/lite/build/suite_lite.gni")
hctest_suite("ActsDfxFuncTest") { hctest_suite("ActsDfxFuncTest") {
suite_name = "acts" suite_name = "acts"
sources = [ sources = [ "src/dfx_hilog.c" ]
"src/dfx_hilog.c",
]
include_dirs = [ include_dirs = [
"src", "src",
"//base/hiviewdfx/hiview_lite", "//base/hiviewdfx/hiview_lite",
"//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite",
"//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits",
"//base/hiviewdfx/hilog_lite/frameworks/mini", "//base/hiviewdfx/hilog_lite/frameworks/mini",
"//vendor/hisi/hi3861/hi3861/include", "//vendor/hisi/hi3861/hi3861/include",
"//vendor/hisi/hi3861/hi3861/components/lwip_sack/include" "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include",
] ]
cflags = [ "-Wno-error" ] cflags = [ "-Wno-error" ]
} }
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
group("ActsFSTest") { group("ActsFSTest") {
deps = [ deps = [
"./vfat_storage:ActsVFATstorageTest",
"./jffs:ActsJFFS2Test", "./jffs:ActsJFFS2Test",
"./nfs:ActsNFSTest", "./nfs:ActsNFSTest",
"./vfat:ActsVFATTest", "./vfat:ActsVFATTest",
"./vfat_storage:ActsVFATstorageTest",
] ]
} }
...@@ -25,6 +25,6 @@ hcpptest_suite("ActsNetTest") { ...@@ -25,6 +25,6 @@ hcpptest_suite("ActsNetTest") {
deps = [ deps = [
"//test/xts/acts/kernel_lite/utils:libutils", "//test/xts/acts/kernel_lite/utils:libutils",
"//third_party/bounds_checking_function:libsec_shared", "//third_party/bounds_checking_function:libsec_shared",
] ]
} }
...@@ -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("time_js_test") { ohos_js_hap_suite("time_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":time_js_assets", ":time_js_assets",
":time_resources", ":time_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 = "TimeJSApiTest" hap_name = "ActsTimeJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("time_js_assets") { ohos_js_assets("time_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": [
"TimeJSApiTest.hap" "ActsTimeJSApiTest.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("timer_js_test") { ohos_js_hap_suite("timer_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":time_js_assets", ":time_js_assets",
":time_resources", ":time_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 = "TimerJSApiTest" hap_name = "ActsTimeJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("time_js_assets") { ohos_js_assets("time_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": [
"TimeJSApiTest.hap" "ActsTimeJSApiTest.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("audio_manager_js_hap") { ohos_js_hap_suite("audio_manager_js_hap") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":audio_manager_js_assets", ":audio_manager_js_assets",
":audio_manager_resources", ":audio_manager_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 = "AudioManagerJsTest" hap_name = "ActsAudioManagerJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("audio_manager_js_assets") { ohos_js_assets("audio_manager_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": [
"AudioManagerJsTest.hap" "ActsAudioManagerJsTest.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("audio_player_js_hap") { ohos_js_hap_suite("audio_player_js_hap") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":audio_player_js_assets", ":audio_player_js_assets",
":audio_player_resources", ":audio_player_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 = "AudioPlayerJsTest" hap_name = "ActsAudioPlayerJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("audio_player_js_assets") { ohos_js_assets("audio_player_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"AudioPlayerJsTest.hap" "ActsAudioPlayerJsTest.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("audio_player_api_js_hap") { ohos_js_hap_suite("audio_player_api_js_hap") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":audio_player_api_js_assets", ":audio_player_api_js_assets",
":audio_player_api_resources", ":audio_player_api_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 = "AudioPlayerApiJsTest" hap_name = "ActsAudioPlayerApiJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("audio_player_api_js_assets") { ohos_js_assets("audio_player_api_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
}, },
{ {
"test-file-name": [ "test-file-name": [
"AudioPlayerApiJsTest.hap" "ActsAudioPlayerApiJsTest.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("audio_recorder_js_hap") { ohos_js_hap_suite("audio_recorder_js_hap") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":audio_recorder_js_assets", ":audio_recorder_js_assets",
":audio_recorder_resources", ":audio_recorder_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 = "AudioRecorderJsTest" hap_name = "ActsAudioRecorderJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("audio_recorder_js_assets") { ohos_js_assets("audio_recorder_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
......
...@@ -16,8 +16,8 @@ group("ans_standard") { ...@@ -16,8 +16,8 @@ group("ans_standard") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
#"actsansnotificationcancel:ActsAnsNotificationCancel", #"actsansnotificationcancel:ActsAnsNotificationCancelTest",
#"actsansnotificationremove:ActsAnsNotificationRemove", #"actsansnotificationremove:ActsAnsNotificationRemoveTest",
"actsansslottest:ActsAnsSlotTest", "actsansslottest:ActsAnsSlotTest",
"publish_test:publish_test", "publish_test:publish_test",
] ]
......
...@@ -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("ActsAnsNotificationCancel") { ohos_js_hap_suite("ActsAnsNotificationCancelTest") {
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 = "ActsAnsNotificationCancel" hap_name = "ActsAnsNotificationCancelTest"
} }
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": [
"ActsAnsNotificationCancel.hap" "ActsAnsNotificationCancelTest.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("ActsAnsNotificationRemove") { ohos_js_hap_suite("ActsAnsNotificationRemoveTest") {
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 = "ActsAnsNotificationRemove" hap_name = "ActsAnsNotificationRemoveTest"
} }
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": [
"ActsAnsNotificationRemove.hap" "ActsAnsNotificationRemoveTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -17,17 +17,17 @@ group("ActsAnsSlotTest") { ...@@ -17,17 +17,17 @@ group("ActsAnsSlotTest") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAdd", "actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAddTest",
"actsansgetslottestcallback:ActsAnsGetSlotTestCallback", "actsansgetslottestcallback:ActsAnsGetSlotTestCallbackTest",
"actsansgetslottestpromise:ActsAnsGetSlotTestPromise", "actsansgetslottestpromise:ActsAnsGetSlotTestPromiseTest",
"actsansremoveslottest:ActsAnsRemoveSlotTest", "actsansremoveslottest:ActsAnsRemoveSlotTest",
"actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAdd", "actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAddTest",
#"actsansslotbybundle:ActsAnsSlotByBundle", #"actsansslotbybundle:ActsAnsSlotByBundleTest",
#"actsansaddslotsystem:ActsAnsAddSlotSystem", #"actsansaddslotsystem:ActsAnsAddSlotSystemTest",
#"actsansslotsystemcallback:ActsAnsSlotSystemCallback", #"actsansslotsystemcallback:ActsAnsSlotSystemCallbackTest",
#"actsansslotsystempromise:ActsAnsSlotSystemPromise", #"actsansslotsystempromise:ActsAnsSlotSystemPromiseTest",
#"actsansslottaddremoveall:ActsAnsSlotAddRemoveAll", #"actsansslottaddremoveall:ActsAnsSlotAddRemoveAllTest",
] ]
} }
} }
...@@ -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("ActsAnsAddSlotSystem") { ohos_js_hap_suite("ActsAnsAddSlotSystemTest") {
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 = "ActsAnsAddSlotSystem" hap_name = "ActsAnsAddSlotSystemTest"
} }
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": [
"ActsAnsAddSlotSystem.hap" "ActsAnsAddSlotSystemTest.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("ActsAnsGetSlotWithoutAdd") { ohos_js_hap_suite("ActsAnsGetSlotWithoutAddTest") {
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 = "ActsAnsGetSlotWithoutAdd" hap_name = "ActsAnsGetSlotWithoutAddTest"
} }
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": [
"ActsAnsGetSlotWithoutAdd.hap" "ActsAnsGetSlotWithoutAddTest.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("ActsAnsGetSlotTestCallback") { ohos_js_hap_suite("ActsAnsGetSlotTestCallbackTest") {
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 = "ActsAnsGetSlotTestCallback" hap_name = "ActsAnsGetSlotTestCallbackTest"
} }
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": [
"ActsAnsGetSlotTestCallback.hap" "ActsAnsGetSlotTestCallbackTest.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("ActsAnsGetSlotTestPromise") { ohos_js_hap_suite("ActsAnsGetSlotTestPromiseTest") {
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 = "ActsAnsGetSlotTestPromise" hap_name = "ActsAnsGetSlotTestPromiseTest"
} }
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": [
"ActsAnsGetSlotTestPromise.hap" "ActsAnsGetSlotTestPromiseTest.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("ActsAnsRemoveSlotWithoutAdd") { ohos_js_hap_suite("ActsAnsRemoveSlotWithoutAddTest") {
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 = "ActsAnsRemoveSlotWithoutAdd" hap_name = "ActsAnsRemoveSlotWithoutAddTest"
} }
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": [
"ActsAnsRemoveSlotWithoutAdd.hap" "ActsAnsRemoveSlotWithoutAddTest.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("ActsAnsSlotByBundle") { ohos_js_hap_suite("ActsAnsSlotByBundleTest") {
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 = "ActsAnsSlotByBundle" hap_name = "ActsAnsSlotByBundleTest"
} }
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": [
"ActsAnsSlotByBundle.hap" "ActsAnsSlotByBundleTest.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("ActsAnsSlotSystemCallback") { ohos_js_hap_suite("ActsAnsSlotSystemCallbackTest") {
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 = "ActsAnsSlotSystemCallback" hap_name = "ActsAnsSlotSystemCallbackTest"
} }
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": [
"ActsAnsSlotSystemCallback.hap" "ActsAnsSlotSystemCallbackTest.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("ActsAnsSlotSystemPromise") { ohos_js_hap_suite("ActsAnsSlotSystemPromiseTest") {
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 = "ActsAnsSlotSystemPromise" hap_name = "ActsAnsSlotSystemPromiseTest"
} }
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": [
"ActsAnsSlotSystemPromise.hap" "ActsAnsSlotSystemPromiseTest.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("ActsAnsSlotAddRemoveAll") { ohos_js_hap_suite("ActsAnsSlotAddRemoveAllTest") {
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 = "ActsAnsSlotAddRemoveAll" hap_name = "ActsAnsSlotAddRemoveAllTest"
} }
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": [
"ActsAnsSlotAddRemoveAll.hap" "ActsAnsSlotAddRemoveAllTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -19,7 +19,7 @@ group("SubscribeAndPublish") { ...@@ -19,7 +19,7 @@ group("SubscribeAndPublish") {
deps = [ deps = [
"actssubscriberorderedtest:ActsSubscriberOrderTest", "actssubscriberorderedtest:ActsSubscriberOrderTest",
#"actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem", #"actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystemTest",
"actssubscriberunordertest:ActsSubscriberUnorderTest", "actssubscriberunordertest:ActsSubscriberUnorderTest",
] ]
} }
......
...@@ -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("ActsSubscriberTestUnorderSystem") { ohos_js_hap_suite("ActsSubscriberTestUnorderSystemTest") {
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 = "ActsSubscriberTestUnorderSystem" hap_name = "ActsSubscriberTestUnorderSystemTest"
} }
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": [
"ActsSubscriberTestUnorderSystem.hap" "ActsSubscriberTestUnorderSystemTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -16,7 +16,8 @@ import("//test/xts/tools/lite/build/suite_lite.gni") ...@@ -16,7 +16,8 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
open_source_suite("ActsOpenPosixBuildOnlyTest") { open_source_suite("ActsOpenPosixBuildOnlyTest") {
suite_name = "acts" suite_name = "acts"
exec_command_path = "//third_party/ltp/testcases/open_posix_testsuite/" exec_command_path = "//third_party/ltp/testcases/open_posix_testsuite/"
compiler = rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}") compiler =
rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}")
sysroot_path = rebase_path(ohos_current_sysroot) sysroot_path = rebase_path(ohos_current_sysroot)
arch_cflags = string_join(" ", target_arch_cflags) arch_cflags = string_join(" ", target_arch_cflags)
prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} \"${arch_cflags}\" && make -j -C conformance/definitions" prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} \"${arch_cflags}\" && make -j -C conformance/definitions"
...@@ -31,10 +32,10 @@ open_source_suite("ActsOpenPosixBuildOnlyTest") { ...@@ -31,10 +32,10 @@ open_source_suite("ActsOpenPosixBuildOnlyTest") {
"aio_h/logfile", "aio_h/logfile",
"sched_h/logfile", "sched_h/logfile",
] ]
deps = [":install_patch"] deps = [ ":install_patch" ]
} }
build_ext_component("install_patch") { build_ext_component("install_patch") {
exec_path = rebase_path(".", root_build_dir) exec_path = rebase_path(".", root_build_dir)
command = "./../../ltp-patch/patch.sh" command = "./../../ltp-patch/patch.sh"
} }
...@@ -16,5 +16,5 @@ group("powermgr") { ...@@ -16,5 +16,5 @@ group("powermgr") {
if (is_standard_system) { if (is_standard_system) {
deps = [ "powermgrbattery:powermgr_battery_test" ] deps = [ "powermgrbattery:powermgr_battery_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("powermgr_battery_test") { ohos_js_hap_suite("powermgr_battery_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":powermgr_battery_js_assets", ":powermgr_battery_js_assets",
":powermgr_battery_resources", ":powermgr_battery_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 = "Powermgrbatterytest" hap_name = "ActsPowerMgrBatteryTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("powermgr_battery_js_assets") { ohos_js_assets("powermgr_battery_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": [
"Powermgrbatterytest.hap" "ActsPowerMgrBatteryTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -18,9 +18,9 @@ group("security") { ...@@ -18,9 +18,9 @@ group("security") {
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
# "authentication_standard/deviceauth_p2p:DeviceauthP2PFunctionCPPTest", # "authentication_standard/deviceauth_p2p:DeviceauthP2PFunctionCPPTest",
"dataprotect/huks_standard_adapter:huks_std_function_test", "dataprotect/huks_standard_adapter:ActsHuksStdFunctionTest",
"deviceauth/deviceauth_function:DeviceAuthFunctionTest", "deviceauth/deviceauth_function:ActsDeviceAuthFunctionTest",
"permission/permissionkitcpp:PermissionKitCPPTest", "permission/permissionkitcpp:ActsPermissionKitCPPTest",
] ]
} else { } else {
deps = deps =
......
...@@ -29,11 +29,7 @@ config("module_private_config") { ...@@ -29,11 +29,7 @@ config("module_private_config") {
} }
######################################################## ########################################################
ohos_moduletest_suite("huks_std_function_test") { ohos_moduletest_suite("ActsHuksStdFunctionTest") {
#subsystem_name = "acts"
#part_name = "huks_standard"
#module_output_path = subsystem_name + "/" + part_name
#module_output_path = module_output_path
configs = [ ":module_private_config" ] configs = [ ":module_private_config" ]
cflags_cc = [ "-DHILOG_ENABLE" ] cflags_cc = [ "-DHILOG_ENABLE" ]
defines = [ "_STANDARD_SYSTEM_" ] defines = [ "_STANDARD_SYSTEM_" ]
...@@ -82,5 +78,5 @@ ohos_moduletest_suite("huks_std_function_test") { ...@@ -82,5 +78,5 @@ ohos_moduletest_suite("huks_std_function_test") {
group("Huksstandardtest") { group("Huksstandardtest") {
testonly = true testonly = true
deps = [ ":huks_std_function_test" ] deps = [ ":ActsHuksStdFunctionTest" ]
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"huks_std_function_test->/data/local/tmp/huks_std_function_test" "ActsHuksStdFunctionTest->/data/local/tmp/ActsHuksStdFunctionTest"
], ],
"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": "huks_std_function_test", "module-name": "ActsHuksStdFunctionTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for huks_std_function_test Tests" "description": "Configuration for ActsHuksStdFunctionTest Tests"
} }
\ No newline at end of file
...@@ -24,7 +24,7 @@ config("module_private_config") { ...@@ -24,7 +24,7 @@ config("module_private_config") {
} }
######################################################## ########################################################
ohos_moduletest_suite("DeviceAuthFunctionTest") { ohos_moduletest_suite("ActsDeviceAuthFunctionTest") {
configs = [ ":module_private_config" ] configs = [ ":module_private_config" ]
cflags_cc = [ "-DHILOG_ENABLE" ] cflags_cc = [ "-DHILOG_ENABLE" ]
defines = [ "_STANDARD_SYSTEM_" ] defines = [ "_STANDARD_SYSTEM_" ]
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"DeviceAuthFunctionTest->/data/local/tmp/DeviceAuthFunctionTest" "ActsDeviceAuthFunctionTest->/data/local/tmp/ActsDeviceAuthFunctionTest"
], ],
"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": "DeviceAuthFunctionTest", "module-name": "ActsDeviceAuthFunctionTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for DeviceAuthFunctionTest Tests" "description": "Configuration for ActsDeviceAuthFunctionTest Tests"
} }
...@@ -77,7 +77,7 @@ ohos_moduletest_suite("PermissionKitReliabilityCPPTest") { ...@@ -77,7 +77,7 @@ ohos_moduletest_suite("PermissionKitReliabilityCPPTest") {
} }
################################################################################## ##################################################################################
ohos_moduletest_suite("PermissionKitCPPTest") { ohos_moduletest_suite("ActsPermissionKitCPPTest") {
subsystem_name = "hits" subsystem_name = "hits"
part_name = "permission_standard" part_name = "permission_standard"
module_out_path = subsystem_name + "/" + part_name module_out_path = subsystem_name + "/" + part_name
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"kits": [ "kits": [
{ {
"push": [ "push": [
"PermissionKitCPPTest->/data/local/tmp/PermissionKitCPPTest" "ActsPermissionKitCPPTest->/data/local/tmp/ActsPermissionKitCPPTest"
], ],
"type": "PushKit", "type": "PushKit",
"post-push": [ "post-push": [
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
"driver": { "driver": {
"native-test-timeout": "120000", "native-test-timeout": "120000",
"type": "CppTest", "type": "CppTest",
"module-name": "PermissionKitCPPTest", "module-name": "ActsPermissionKitCPPTest",
"runtime-hint": "1s", "runtime-hint": "1s",
"native-test-device-path": "/data/local/tmp" "native-test-device-path": "/data/local/tmp"
}, },
"description": "Configuration for PermissionKitCPPTest Tests" "description": "Configuration for ActsPermissionKitCPPTest Tests"
} }
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
# 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/lite/build/suite_lite.gni")
import("//base/security/huks/build/config.gni") import("//base/security/huks/build/config.gni")
import("//test/xts/tools/lite/build/suite_lite.gni")
hctest_suite("ActsSecurityDataTest") { hctest_suite("ActsSecurityDataTest") {
suite_name = "acts" suite_name = "acts"
...@@ -24,7 +24,7 @@ hctest_suite("ActsSecurityDataTest") { ...@@ -24,7 +24,7 @@ hctest_suite("ActsSecurityDataTest") {
"src/security_data_huks_sign_verify_test.c", "src/security_data_huks_sign_verify_test.c",
] ]
if (disable_authenticate == true) { if (disable_authenticate == true) {
defines = [ "_CUT_AUTHENTICATE_" ] defines = [ "_CUT_AUTHENTICATE_" ]
} }
include_dirs = [ include_dirs = [
"src", "src",
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
# 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/lite/build/suite_lite.gni")
import("//build/lite/config/subsystem/aafwk/config.gni") import("//build/lite/config/subsystem/aafwk/config.gni")
import("//test/xts/tools/lite/build/suite_lite.gni")
hcpptest_suite("ActsJFFS2CapabilityTest") { hcpptest_suite("ActsJFFS2CapabilityTest") {
suite_name = "acts" suite_name = "acts"
...@@ -40,17 +40,18 @@ hcpptest_suite("ActsJFFS2CapabilityTest") { ...@@ -40,17 +40,18 @@ hcpptest_suite("ActsJFFS2CapabilityTest") {
"-lpthread", "-lpthread",
] ]
if(enable_ohos_appexecfwk_feature_ability == true) { if (enable_ohos_appexecfwk_feature_ability == true) {
defines = ["_BOARD_HI3516_", defines = [
"LITE_FS_JFFS2", "_BOARD_HI3516_",
"TOP_DIR=\"/storage\"", "LITE_FS_JFFS2",
"TOP_DIR_MOUNT_INFO=\"/storage jffs\"", "TOP_DIR=\"/storage\"",
] "TOP_DIR_MOUNT_INFO=\"/storage jffs\"",
]
} else { } else {
defines = [ defines = [
"LITE_FS_JFFS2", "LITE_FS_JFFS2",
"TOP_DIR=\"/storage\"", "TOP_DIR=\"/storage\"",
"TOP_DIR_MOUNT_INFO=\"/storage jffs\"", "TOP_DIR_MOUNT_INFO=\"/storage jffs\"",
] ]
} }
} }
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
# 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/lite/build/suite_lite.gni")
import("//build/lite/config/subsystem/aafwk/config.gni") import("//build/lite/config/subsystem/aafwk/config.gni")
import("//test/xts/tools/lite/build/suite_lite.gni")
hcpptest_suite("ActsVFATCapabilityTest") { hcpptest_suite("ActsVFATCapabilityTest") {
suite_name = "acts" suite_name = "acts"
...@@ -40,18 +40,18 @@ hcpptest_suite("ActsVFATCapabilityTest") { ...@@ -40,18 +40,18 @@ hcpptest_suite("ActsVFATCapabilityTest") {
"-lpthread", "-lpthread",
] ]
if(enable_ohos_appexecfwk_feature_ability == true) { if (enable_ohos_appexecfwk_feature_ability == true) {
defines = ["_BOARD_HI3516_", defines = [
"LITE_FS_VFAT", "_BOARD_HI3516_",
"TOP_DIR=\"/sdcard\"", "LITE_FS_VFAT",
"TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", "TOP_DIR=\"/sdcard\"",
] "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"",
]
} else { } else {
defines = [ defines = [
"LITE_FS_VFAT", "LITE_FS_VFAT",
"TOP_DIR=\"/sdcard\"", "TOP_DIR=\"/sdcard\"",
"TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"",
] ]
} }
} }
...@@ -16,8 +16,6 @@ import("//build/ohos_var.gni") ...@@ -16,8 +16,6 @@ import("//build/ohos_var.gni")
group("startup") { group("startup") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [ "startup_standard:startup_js_test" ]
"startup_standard:startup_js_test",
]
} }
} }
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("startup_js_test") { ohos_js_hap_suite("startup_js_test") {
...@@ -18,14 +19,8 @@ ohos_js_hap_suite("startup_js_test") { ...@@ -18,14 +19,8 @@ ohos_js_hap_suite("startup_js_test") {
":startup_js_assets", ":startup_js_assets",
":startup_js_resources", ":startup_js_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 = "StartupJSApiTest" hap_name = "ActsStartupJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("startup_js_assets") { ohos_js_assets("startup_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": [
"StartupJSApiTest.hap" "ActsStartupJSApiTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -15,9 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") ...@@ -15,9 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
hctest_suite("ActsBootstrapTest") { hctest_suite("ActsBootstrapTest") {
suite_name = "acts" suite_name = "acts"
sources = [ sources = [ "src/samgr_api_test.c" ]
"src/samgr_api_test.c"
]
include_dirs = [ include_dirs = [
"src", "src",
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagedsm_js_test") { ohos_js_hap_suite("storagedsm_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsm_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsm_js_test") {
":storagedsm_js_assets", ":storagedsm_js_assets",
":storagedsm_js_resources", ":storagedsm_js_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 = "storagedsmjstest" hap_name = "ActsStorageFmsPublicJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagedsm_js_assets") { ohos_js_assets("storagedsm_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": [
"storagefmspublicjstest.hap" "ActsStorageFmsPublicJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagedsmstability_js_test") { ohos_js_hap_suite("storagedsmstability_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsmstability_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsmstability_js_test") {
":storagedsmstability_js_assets", ":storagedsmstability_js_assets",
":storagedsmstability_js_resources", ":storagedsmstability_js_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 = "storagedsmstabilityjstest" hap_name = "ActsStorageFmsPublicJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagedsmstability_js_assets") { ohos_js_assets("storagedsmstability_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": [
"storagefmspublicjstest.hap" "ActsStorageFmsPublicJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefileconcurrent_js_test") { ohos_js_hap_suite("storagefileconcurrent_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileconcurrent_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileconcurrent_js_test") {
":storagefileconcurrent_js_assets", ":storagefileconcurrent_js_assets",
":storagefileconcurrent_js_resources", ":storagefileconcurrent_js_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 = "storagefileconcurrentjstest" hap_name = "ActsStorageFileConcurrentJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefileconcurrent_js_assets") { ohos_js_assets("storagefileconcurrent_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": [
"storagefileconcurrentjstest.hap" "ActsStorageFileConcurrentJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefileioerror_js_test") { ohos_js_hap_suite("storagefileioerror_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioerror_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioerror_js_test") {
":storagefileioerror_js_assets", ":storagefileioerror_js_assets",
":storagefileioerror_js_resources", ":storagefileioerror_js_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 = "storagefileioerrorjstest" hap_name = "ActsStorageFileIoErrorJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefileioerror_js_assets") { ohos_js_assets("storagefileioerror_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": [
"storagefileioerrorjstest.hap" "ActsStorageFileIoErrorJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefileioperformance_js_test") { ohos_js_hap_suite("storagefileioperformance_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioperformance_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioperformance_js_test") {
":storagefileioperformance_js_assets", ":storagefileioperformance_js_assets",
":storagefileioperformance_js_resources", ":storagefileioperformance_js_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 = "storagefileioperformancejstest" hap_name = "ActsStorageFileIoPerformanceJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefileioperformance_js_assets") { ohos_js_assets("storagefileioperformance_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": [
"storagefileioperformancejstest.hap" "ActsStorageFileIoPerformanceJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefileioreliability_js_test") { ohos_js_hap_suite("storagefileioreliability_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioreliability_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioreliability_js_test") {
":storagefileioreliability_js_assets", ":storagefileioreliability_js_assets",
":storagefileioreliability_js_resources", ":storagefileioreliability_js_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 = "storagefileioreliabilityjstest" hap_name = "ActsStorageFileIoreLiabilityJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefileioreliability_js_assets") { ohos_js_assets("storagefileioreliability_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": [
"storagefileioreliabilityjstest.hap" "ActsStorageFileIoreLiabilityJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefileiostability_js_test") { ohos_js_hap_suite("storagefileiostability_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileiostability_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileiostability_js_test") {
":storagefileiostability_js_assets", ":storagefileiostability_js_assets",
":storagefileiostability_js_resources", ":storagefileiostability_js_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 = "storagefileiostabilityjstest" hap_name = "ActsStorageFileIoStabilityJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefileiostability_js_assets") { ohos_js_assets("storagefileiostability_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": [
"storagefileiostabilityjstest.hap" "ActsStorageFileIoStabilityJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefilestability_js_test") { ohos_js_hap_suite("storagefilestability_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefilestability_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefilestability_js_test") {
":storagefilestability_js_assets", ":storagefilestability_js_assets",
":storagefilestability_js_resources", ":storagefilestability_js_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 = "storagefilestabilityjstest" hap_name = "ActsStorageFileStabilityJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefilestability_js_assets") { ohos_js_assets("storagefilestability_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": [
"storagefilestabilityjstest.hap" "ActsStorageFileStabilityJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefmspublic_js_test") { ohos_js_hap_suite("storagefmspublic_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmspublic_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmspublic_js_test") {
":storagefmspublic_js_assets", ":storagefmspublic_js_assets",
":storagefmspublic_js_resources", ":storagefmspublic_js_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 = "storagefmspublicjstest" hap_name = "ActsStorageFmsPublicJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefmspublic_js_assets") { ohos_js_assets("storagefmspublic_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": [
"storagefmspublicjstest.hap" "ActsStorageFmsPublicJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("storagefmsshare_js_test") { ohos_js_hap_suite("storagefmsshare_js_test") {
...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmsshare_js_test") { ...@@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmsshare_js_test") {
":storagefmsshare_js_assets", ":storagefmsshare_js_assets",
":storagefmsshare_js_resources", ":storagefmsshare_js_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 = "storagefmssharejstest" hap_name = "ActsStorageFmsShareJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("storagefmsshare_js_assets") { ohos_js_assets("storagefmsshare_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": [
"storagefmssharejstest.hap" "ActsStorageFmsShareJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerMMI") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerMMI") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "CallManagerMMI" hap_name = "ActsCallManagerMMITest"
} }
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"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"$module.hap" "ActsCallManagerMMITest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerOnDail") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerOnDail") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "CallManagerOnDail" hap_name = "ActsCallManagerOnDailTest"
} }
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"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"$module.hap" "ActsCallManagerOnDailTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerTest") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerTest") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "CallManagerTest" hap_name = "ActsCallManagerTest"
} }
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"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("NetworkSearchInformation") { ohos_js_hap_suite("NetworkSearchInformation") {
...@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchInformation") { ...@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchInformation") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "NetworkSearchInformation" hap_name = "ActsNetworkSearchInformationTest"
} }
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"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("NetworkSearchRadio") { ohos_js_hap_suite("NetworkSearchRadio") {
...@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchRadio") { ...@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchRadio") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "NetworkSearchRadio" hap_name = "ActsNetworkSearchRadioTest"
} }
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"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# 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("NetworkSearchSelectionMoce") { ohos_js_hap_suite("NetworkSearchSelectionMoce") {
...@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchSelectionMoce") { ...@@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchSelectionMoce") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "NetworkSearchSelectionMoce" hap_name = "ActsNetworkSearchSelectionMoceTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimFileManagerFunctionTest") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimFileManagerFunctionTest") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SimFileManagerFunctionTest" hap_name = "ActsSimFileManagerFunctionTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimManagerFunctionTest") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimManagerFunctionTest") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SimManagerFunctionTest" hap_name = "ActsSimManagerFunctionTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimNoSimFunctionTest") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimNoSimFunctionTest") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SimNoSimFunctionTest" hap_name = "ActsSimNoSimFunctionTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimStateManagerFunctionTest") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SimStateManagerFunctionTest") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SimStateManagerFunctionTest" hap_name = "ActsSimStateManagerFunctionTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsAdd") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsAdd") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsAdd" hap_name = "ActsSmsMmsAddTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsConfig" hap_name = "ActsSmsMmsConfigTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsCreateMessage") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsCreateMessage") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsCreateMessage" hap_name = "ActsSmsMmsCreateMessageTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsDelSim") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsDelSim") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsDelSim" hap_name = "ActsSmsMmsDelSimTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsFunction") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsFunction") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsFunction" hap_name = "ActsSmsMmsFunctionTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsGetAll") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsGetAll") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsGetAll" hap_name = "ActsSmsMmsGetAllTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsConfig" hap_name = "ActsSmsMmsConfigTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsSmsc") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsSmsc") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsSmsc" hap_name = "ActsSmsMmsSmscTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataAsy") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataAsy") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsUpdataAsy" hap_name = "ActsSmsMmsUpdataAsyTest"
} }
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"
......
...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataPro") { ...@@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataPro") {
":hjs_demo_resources", ":hjs_demo_resources",
] ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "SmsMmsUpdataPro" hap_name = "ActsSmsMmsUpdataProTest"
} }
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"
......
...@@ -22,7 +22,7 @@ hcpptest_suite("ActsUpdateTest") { ...@@ -22,7 +22,7 @@ hcpptest_suite("ActsUpdateTest") {
"//base/update/ota_lite/hals", "//base/update/ota_lite/hals",
"//utils/native/lite/include", "//utils/native/lite/include",
] ]
deps = [ deps = [
"$ohos_third_party_dir/mbedtls:mbedtls_static", "$ohos_third_party_dir/mbedtls:mbedtls_static",
"//base/update/ota_lite/frameworks/source:hota", "//base/update/ota_lite/frameworks/source:hota",
] ]
......
...@@ -16,8 +16,6 @@ import("//build/ohos_var.gni") ...@@ -16,8 +16,6 @@ import("//build/ohos_var.gni")
group("update") { group("update") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [ "update_test:update_js_test" ]
"update_test:update_js_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("update_js_test") { ohos_js_hap_suite("update_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
deps = [ deps = [
":update_js_assets", ":update_js_assets",
":update_js_resources", ":update_js_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 = "updatejstest" hap_name = "ActsUpdateJsTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("update_js_assets") { ohos_js_assets("update_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": [
"updatejstest.hap" "ActsUpdateJsTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册