From 7714b2c14479b4a63dfb4895e150849e42da57b6 Mon Sep 17 00:00:00 2001 From: jiyong Date: Fri, 10 Dec 2021 20:10:27 +0800 Subject: [PATCH] jiyong@huawei.com Signed-off-by: jiyong --- ace/BUILD.gn | 4 +--- ai_lite/ai_engine_posix/base/BUILD.gn | 3 ++- demo/BUILD.gn | 4 +--- developtools/hiplugintest/BUILD.gn | 14 ++++++-------- .../distributed_schedule_posix/BUILD.gn | 2 +- global_lite/i18n_lite/BUILD.gn | 6 +++--- .../hisyseventtest/hisyseventcpptest/BUILD.gn | 4 +--- hiviewdfx_lite/hievent_hal/BUILD.gn | 4 +--- hiviewdfx_lite/hilog_hal/BUILD.gn | 6 ++---- kernel_lite/fs_posix/BUILD.gn | 3 +-- .../conformance/definitions/BUILD.gn | 9 +++++---- security_lite/huks_hal/BUILD.gn | 4 ++-- startup/BUILD.gn | 4 +--- startup_lite/bootstrap_hal/BUILD.gn | 4 +--- updater/BUILD.gn | 4 +--- 15 files changed, 29 insertions(+), 46 deletions(-) diff --git a/ace/BUILD.gn b/ace/BUILD.gn index 5ce5e15cd..46e05a85e 100755 --- a/ace/BUILD.gn +++ b/ace/BUILD.gn @@ -13,7 +13,5 @@ group("ace") { testonly = true - deps = [ - "ace_standard:ace_standard_test", - ] + deps = [ "ace_standard:ace_standard_test" ] } diff --git a/ai_lite/ai_engine_posix/base/BUILD.gn b/ai_lite/ai_engine_posix/base/BUILD.gn index 44e440573..1ce659268 100644 --- a/ai_lite/ai_engine_posix/base/BUILD.gn +++ b/ai_lite/ai_engine_posix/base/BUILD.gn @@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") { ldflags = [ "-lstdc++", "-ldl", - "-lpthread",] + "-lpthread", + ] } diff --git a/demo/BUILD.gn b/demo/BUILD.gn index 4493027cb..2cd256658 100755 --- a/demo/BUILD.gn +++ b/demo/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos_var.gni") group("demo") { testonly = true if (is_standard_system) { - deps = [ - "hjsunit_sample:hjs_demo_test", - ] + deps = [ "hjsunit_sample:hjs_demo_test" ] } } diff --git a/developtools/hiplugintest/BUILD.gn b/developtools/hiplugintest/BUILD.gn index dad1adf39..fe9ce486b 100755 --- a/developtools/hiplugintest/BUILD.gn +++ b/developtools/hiplugintest/BUILD.gn @@ -17,14 +17,14 @@ import("../../../../../developtools/profiler/device/base/config.gni") ############################################################################### config("module_private_config") { - visibility = [":*"] + visibility = [ ":*" ] } ohos_moduletest_suite("hipluginmoduleapitest") { 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}/protos/types/plugins/memory_data:memory_data_cpp", + "//third_party/googletest:gtest", ] include_dirs = [ "${OHOS_PROFILER_DIR}/interfaces/kits/", @@ -42,11 +42,9 @@ ohos_moduletest_suite("hipluginmoduleapitest") { cflags = [ "-pthread", "-Wno-inconsistent-missing-override", - "-Dprivate=public", #allow test code access private members - ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "-Dprivate=public", #allow test code access private members ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - defines = [ "HAVE_HILOG", ] + defines = [ "HAVE_HILOG" ] } diff --git a/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn b/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn index 68febbed2..b274cca84 100755 --- a/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn +++ b/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn @@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr", + "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] cflags = [ "-Wno-error" ] diff --git a/global_lite/i18n_lite/BUILD.gn b/global_lite/i18n_lite/BUILD.gn index 6015fbfa6..2f0e37e61 100755 --- a/global_lite/i18n_lite/BUILD.gn +++ b/global_lite/i18n_lite/BUILD.gn @@ -13,12 +13,12 @@ group("ActsGlobalTest") { 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/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", - + # depend on the resources #"//test/xts/acts/global_lite/i18n_lite/resource_parse_load/src:ResourceParseLoadtest", ] diff --git a/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn b/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn index a01956e28..014be04e1 100755 --- a/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn +++ b/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn @@ -27,9 +27,7 @@ config("hilogtest_config") { } ohos_moduletest_suite("ActsHiSysEventCPPTest") { module_out_path = module_output_path - sources = [ - "HiSysEventCPPTest.cpp", - ] + sources = [ "HiSysEventCPPTest.cpp" ] deps = [ "../../utils/native:utilskit", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", diff --git a/hiviewdfx_lite/hievent_hal/BUILD.gn b/hiviewdfx_lite/hievent_hal/BUILD.gn index ba00f0393..0470d375a 100755 --- a/hiviewdfx_lite/hievent_hal/BUILD.gn +++ b/hiviewdfx_lite/hievent_hal/BUILD.gn @@ -14,9 +14,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsHieventLiteTest") { suite_name = "acts" - sources = [ - "src/hievent_lite_test.c", - ] + sources = [ "src/hievent_lite_test.c" ] include_dirs = [ "src", diff --git a/hiviewdfx_lite/hilog_hal/BUILD.gn b/hiviewdfx_lite/hilog_hal/BUILD.gn index e08bae607..37d71fcbe 100755 --- a/hiviewdfx_lite/hilog_hal/BUILD.gn +++ b/hiviewdfx_lite/hilog_hal/BUILD.gn @@ -14,9 +14,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsDfxFuncTest") { suite_name = "acts" - sources = [ - "src/dfx_hilog.c", - ] + sources = [ "src/dfx_hilog.c" ] include_dirs = [ "src", @@ -25,7 +23,7 @@ hctest_suite("ActsDfxFuncTest") { "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", "//base/hiviewdfx/hilog_lite/frameworks/mini", "//vendor/hisi/hi3861/hi3861/include", - "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include" + "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include", ] cflags = [ "-Wno-error" ] diff --git a/kernel_lite/fs_posix/BUILD.gn b/kernel_lite/fs_posix/BUILD.gn index 3b766852a..d861284ac 100644 --- a/kernel_lite/fs_posix/BUILD.gn +++ b/kernel_lite/fs_posix/BUILD.gn @@ -13,10 +13,9 @@ group("ActsFSTest") { deps = [ - "./vfat_storage:ActsVFATstorageTest", "./jffs:ActsJFFS2Test", "./nfs:ActsNFSTest", "./vfat:ActsVFATTest", - + "./vfat_storage:ActsVFATstorageTest", ] } diff --git a/open_posix_testsuite/conformance/definitions/BUILD.gn b/open_posix_testsuite/conformance/definitions/BUILD.gn index c0b176885..77daa424f 100644 --- a/open_posix_testsuite/conformance/definitions/BUILD.gn +++ b/open_posix_testsuite/conformance/definitions/BUILD.gn @@ -16,7 +16,8 @@ import("//test/xts/tools/lite/build/suite_lite.gni") open_source_suite("ActsOpenPosixBuildOnlyTest") { suite_name = "acts" 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) 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" @@ -31,10 +32,10 @@ open_source_suite("ActsOpenPosixBuildOnlyTest") { "aio_h/logfile", "sched_h/logfile", ] - deps = [":install_patch"] + deps = [ ":install_patch" ] } build_ext_component("install_patch") { - exec_path = rebase_path(".", root_build_dir) - command = "./../../ltp-patch/patch.sh" + exec_path = rebase_path(".", root_build_dir) + command = "./../../ltp-patch/patch.sh" } diff --git a/security_lite/huks_hal/BUILD.gn b/security_lite/huks_hal/BUILD.gn index 8f779440c..2c56dff03 100755 --- a/security_lite/huks_hal/BUILD.gn +++ b/security_lite/huks_hal/BUILD.gn @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/lite/build/suite_lite.gni") import("//base/security/huks/build/config.gni") +import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsSecurityDataTest") { suite_name = "acts" @@ -24,7 +24,7 @@ hctest_suite("ActsSecurityDataTest") { "src/security_data_huks_sign_verify_test.c", ] if (disable_authenticate == true) { - defines = [ "_CUT_AUTHENTICATE_" ] + defines = [ "_CUT_AUTHENTICATE_" ] } include_dirs = [ "src", diff --git a/startup/BUILD.gn b/startup/BUILD.gn index 19d2286ae..742f39388 100755 --- a/startup/BUILD.gn +++ b/startup/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos_var.gni") group("startup") { testonly = true if (is_standard_system) { - deps = [ - "startup_standard:startup_js_test", - ] + deps = [ "startup_standard:startup_js_test" ] } } diff --git a/startup_lite/bootstrap_hal/BUILD.gn b/startup_lite/bootstrap_hal/BUILD.gn index 6fb0aa302..08d2099e8 100644 --- a/startup_lite/bootstrap_hal/BUILD.gn +++ b/startup_lite/bootstrap_hal/BUILD.gn @@ -15,9 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsBootstrapTest") { suite_name = "acts" - sources = [ - "src/samgr_api_test.c" - ] + sources = [ "src/samgr_api_test.c" ] include_dirs = [ "src", diff --git a/updater/BUILD.gn b/updater/BUILD.gn index 714f0ce59..e12acda63 100644 --- a/updater/BUILD.gn +++ b/updater/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos_var.gni") group("update") { testonly = true if (is_standard_system) { - deps = [ - "update_test:update_js_test", - ] + deps = [ "update_test:update_js_test" ] } } -- GitLab