提交 7714b2c1 编写于 作者: J jiyong

jiyong@huawei.com

Signed-off-by: Njiyong <jiyong@huawei.com>
上级 15affaa3
...@@ -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",
]
} }
...@@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") { ...@@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") {
ldflags = [ ldflags = [
"-lstdc++", "-lstdc++",
"-ldl", "-ldl",
"-lpthread",] "-lpthread",
]
} }
...@@ -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",
]
} }
} }
...@@ -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" ]
......
...@@ -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",
] ]
......
...@@ -27,9 +27,7 @@ config("hilogtest_config") { ...@@ -27,9 +27,7 @@ config("hilogtest_config") {
} }
ohos_moduletest_suite("ActsHiSysEventCPPTest") { 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",
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
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",
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
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",
...@@ -25,7 +23,7 @@ hctest_suite("ActsDfxFuncTest") { ...@@ -25,7 +23,7 @@ hctest_suite("ActsDfxFuncTest") {
"//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",
] ]
} }
...@@ -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"
} }
...@@ -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",
......
...@@ -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",
]
} }
} }
...@@ -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",
......
...@@ -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",
]
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册