提交 3b808381 编写于 作者: O openharmony_ci 提交者: Gitee

!701 按照门禁要求对所有BUILD.gn脚本进行格式化

Merge pull request !701 from Caoruihong/gnformat
...@@ -46,7 +46,10 @@ copy("copy_toybox_config") { ...@@ -46,7 +46,10 @@ copy("copy_toybox_config") {
} }
build_ext_component("build_toybox") { build_ext_component("build_toybox") {
deps = [ ":copy_toybox_src", ":copy_toybox_config" ] deps = [
":copy_toybox_config",
":copy_toybox_src",
]
deps += [ "//prebuilts/lite/sysroot" ] deps += [ "//prebuilts/lite/sysroot" ]
exec_path = rebase_path("$target_out_dir/toybox_build") exec_path = rebase_path("$target_out_dir/toybox_build")
......
...@@ -31,4 +31,4 @@ import("//kernel/liteos_a/liteos.gni") ...@@ -31,4 +31,4 @@ import("//kernel/liteos_a/liteos.gni")
executable("trace") { executable("trace") {
sources = [ "src/trace.c" ] sources = [ "src/trace.c" ]
} }
\ No newline at end of file
...@@ -34,11 +34,11 @@ kernel_module(module_name) { ...@@ -34,11 +34,11 @@ kernel_module(module_name) {
sources = [ sources = [
"core/los_bitmap.c", "core/los_bitmap.c",
"core/los_process.c", "core/los_process.c",
"core/los_smp.c",
"core/los_swtmr.c", "core/los_swtmr.c",
"core/los_sys.c", "core/los_sys.c",
"core/los_task.c", "core/los_task.c",
"core/los_tick.c", "core/los_tick.c",
"core/los_smp.c",
"ipc/los_event.c", "ipc/los_event.c",
"ipc/los_futex.c", "ipc/los_futex.c",
"ipc/los_ipcdebug.c", "ipc/los_ipcdebug.c",
......
...@@ -33,8 +33,8 @@ module_switch = defined(LOSCFG_KERNEL_TRACE) ...@@ -33,8 +33,8 @@ module_switch = defined(LOSCFG_KERNEL_TRACE)
module_name = get_path_info(rebase_path("."), "name") module_name = get_path_info(rebase_path("."), "name")
kernel_module(module_name) { kernel_module(module_name) {
sources = [ sources = [
"los_trace.c",
"cnv/trace_cnv.c", "cnv/trace_cnv.c",
"los_trace.c",
] ]
include_dirs = [ include_dirs = [
...@@ -43,11 +43,11 @@ kernel_module(module_name) { ...@@ -43,11 +43,11 @@ kernel_module(module_name) {
"pipeline", "pipeline",
] ]
if (defined(LOSCFG_RECORDER_MODE_OFFLINE)){ if (defined(LOSCFG_RECORDER_MODE_OFFLINE)) {
sources += [ "trace_offline.c" ] sources += [ "trace_offline.c" ]
} }
if (defined(LOSCFG_RECORDER_MODE_ONLINE)){ if (defined(LOSCFG_RECORDER_MODE_ONLINE)) {
sources += [ "trace_online.c" ] sources += [ "trace_online.c" ]
} }
......
...@@ -69,13 +69,13 @@ kernel_module(module_name) { ...@@ -69,13 +69,13 @@ kernel_module(module_name) {
"-D__memchr_arm=memchr", "-D__memchr_arm=memchr",
] ]
sources += [ sources += [
"src/arch/arm/memset.S",
"src/arch/arm/memcmp.S", "src/arch/arm/memcmp.S",
"src/arch/arm/memset.S",
] ]
} else { } else {
sources += [ sources += [
"src/memset.c",
"src/memcmp.c", "src/memcmp.c",
"src/memset.c",
] ]
} }
......
...@@ -45,7 +45,8 @@ template("kernel_module") { ...@@ -45,7 +45,8 @@ template("kernel_module") {
if (target_name != current_dir_name) { if (target_name != current_dir_name) {
build_gn = rebase_path("BUILD.gn") build_gn = rebase_path("BUILD.gn")
cmd = "if grep -q '^\s*group\s*(\s*\"$current_dir_name\"\s*)\s*{\s*\$' $build_gn; then echo true; else echo false; fi" cmd = "if grep -q '^\s*group\s*(\s*\"$current_dir_name\"\s*)\s*{\s*\$' $build_gn; then echo true; else echo false; fi"
has_current_dir_group = exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value") has_current_dir_group =
exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
if (!has_current_dir_group) { if (!has_current_dir_group) {
module_name = target_name module_name = target_name
group(current_dir_name) { group(current_dir_name) {
...@@ -66,7 +67,8 @@ template("kernel_module") { ...@@ -66,7 +67,8 @@ template("kernel_module") {
template("config") { template("config") {
config(target_name) { config(target_name) {
if (defined(invoker.module_switch) && !invoker.module_switch && target_name == "public") { if (defined(invoker.module_switch) && !invoker.module_switch &&
target_name == "public") {
not_needed(invoker, "*") not_needed(invoker, "*")
forward_variables_from(invoker, [ "configs" ]) forward_variables_from(invoker, [ "configs" ])
} else { } else {
......
...@@ -36,14 +36,13 @@ local_flags = [ ...@@ -36,14 +36,13 @@ local_flags = [
"-Wno-narrowing", "-Wno-narrowing",
"-fPIE", "-fPIE",
] ]
if (LOSCFG_USER_TEST_SMP == "enable" || (LOSCFG_USER_TEST_SMP == "default" && board_name == "hispark_taurus")) { if (LOSCFG_USER_TEST_SMP == "enable" ||
(LOSCFG_USER_TEST_SMP == "default" && board_name == "hispark_taurus")) {
local_flags += [ "-DLOSCFG_USER_TEST_SMP" ] local_flags += [ "-DLOSCFG_USER_TEST_SMP" ]
} }
config("public_config_for_door") { config("public_config_for_door") {
cflags = [ cflags = [ "-DLOSCFG_USER_TEST_SMOKE" ]
"-DLOSCFG_USER_TEST_SMOKE",
]
cflags += local_flags cflags += local_flags
cflags_cc = cflags cflags_cc = cflags
} }
...@@ -58,9 +57,7 @@ config("public_config_for_all") { ...@@ -58,9 +57,7 @@ config("public_config_for_all") {
} }
config("public_config_for_pressure") { config("public_config_for_pressure") {
cflags = [ cflags = [ "-DLOSCFG_USER_TEST_PRESSURE" ]
"-DLOSCFG_USER_TEST_PRESSURE",
]
cflags += local_flags cflags += local_flags
cflags_cc = cflags cflags_cc = cflags
} }
...@@ -276,7 +273,8 @@ group("unittest") { ...@@ -276,7 +273,8 @@ group("unittest") {
} }
if (LOSCFG_USER_TEST_SECURITY_CAPABILITY == true) { if (LOSCFG_USER_TEST_SECURITY_CAPABILITY == true) {
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
deps += [ "security/capability:liteos_a_security_capability_unittest_door" ] deps +=
[ "security/capability:liteos_a_security_capability_unittest_door" ]
} }
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
deps += [ "security/capability:liteos_a_security_capability_unittest" ] deps += [ "security/capability:liteos_a_security_capability_unittest" ]
......
...@@ -41,8 +41,7 @@ sources_entry = [ ...@@ -41,8 +41,7 @@ sources_entry = [
"ipc_test.cpp", "ipc_test.cpp",
] ]
sources_smoke = [ sources_smoke = []
]
sources_full = [ sources_full = [
"full/IPC_test_mkfifoat_001.cpp", "full/IPC_test_mkfifoat_001.cpp",
......
...@@ -41,12 +41,9 @@ sources_entry = [ ...@@ -41,12 +41,9 @@ sources_entry = [
"drivers_hid_test.cpp", "drivers_hid_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/hid_test_001.cpp" ]
"smoke/hid_test_001.cpp",
]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_drivers_hid_unittest_door") { unittest("liteos_a_drivers_hid_unittest_door") {
...@@ -73,4 +70,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { ...@@ -73,4 +70,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
} }
} }
\ No newline at end of file
...@@ -41,12 +41,9 @@ sources_entry = [ ...@@ -41,12 +41,9 @@ sources_entry = [
"drivers_storage_test.cpp", "drivers_storage_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/storage_test_001.cpp" ]
"smoke/storage_test_001.cpp",
]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_drivers_storage_unittest_door") { unittest("liteos_a_drivers_storage_unittest_door") {
...@@ -73,4 +70,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { ...@@ -73,4 +70,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
} }
} }
\ No newline at end of file
...@@ -46,8 +46,7 @@ sources_smoke = [ ...@@ -46,8 +46,7 @@ sources_smoke = [
"smoke/dynload_test_004.cpp", "smoke/dynload_test_004.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_dynload_unittest_door") { unittest("liteos_a_dynload_unittest_door") {
...@@ -74,4 +73,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { ...@@ -74,4 +73,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
} }
} }
\ No newline at end of file
...@@ -49,9 +49,7 @@ sources_smoke = [ ...@@ -49,9 +49,7 @@ sources_smoke = [
"smoke/it_test_exc_005.cpp", "smoke/it_test_exc_005.cpp",
] ]
sources_full = [ sources_full = [ "full/it_test_fexecve_001.cpp" ]
"full/it_test_fexecve_001.cpp",
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_exc_unittest_door") { unittest("liteos_a_exc_unittest_door") {
...@@ -78,4 +76,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { ...@@ -78,4 +76,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
configs = [ "..:public_config_for_all" ] configs = [ "..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
} }
} }
\ No newline at end of file
...@@ -41,8 +41,7 @@ sources_entry = [ ...@@ -41,8 +41,7 @@ sources_entry = [
"It_vfs_proc.cpp", "It_vfs_proc.cpp",
] ]
sources_smoke = [ sources_smoke = []
]
sources_full = [ sources_full = [
"full/It_vfs_proc_001.cpp", "full/It_vfs_proc_001.cpp",
...@@ -78,4 +77,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) { ...@@ -78,4 +77,4 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
configs = [ "../..:public_config_for_all" ] configs = [ "../..:public_config_for_all" ]
deps = [ "//third_party/bounds_checking_function:libsec_shared" ] deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
} }
} }
\ No newline at end of file
...@@ -42,9 +42,7 @@ sources_entry = [ ...@@ -42,9 +42,7 @@ sources_entry = [
"VfsFatTest.cpp", "VfsFatTest.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/It_vfs_fat_026.cpp" ]
"smoke/It_vfs_fat_026.cpp",
]
sources_pressure = [ sources_pressure = [
"pressure/It_fs_fat_performance_001.cpp", "pressure/It_fs_fat_performance_001.cpp",
......
...@@ -47,8 +47,7 @@ sources_smoke = [ ...@@ -47,8 +47,7 @@ sources_smoke = [
"smoke/liteipc_test_002.cpp", "smoke/liteipc_test_002.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_liteipc_unittest_door") { unittest("liteos_a_liteipc_unittest_door") {
......
...@@ -41,9 +41,7 @@ sources_entry = [ ...@@ -41,9 +41,7 @@ sources_entry = [
"mem_shm_test.cpp", "mem_shm_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/shm_test_011.cpp" ]
"smoke/shm_test_011.cpp",
]
sources_full = [ sources_full = [
"full/shm_test_001.cpp", "full/shm_test_001.cpp",
......
...@@ -59,8 +59,7 @@ sources_smoke = [ ...@@ -59,8 +59,7 @@ sources_smoke = [
"smoke/user_copy_test_001.cpp", "smoke/user_copy_test_001.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_mem_vm_unittest_door") { unittest("liteos_a_mem_vm_unittest_door") {
......
...@@ -44,8 +44,8 @@ common_include_dirs = [ ...@@ -44,8 +44,8 @@ common_include_dirs = [
] ]
sources_entry = [ sources_entry = [
"../../common/osTest.cpp", "../../common/osTest.cpp",
"net_netdb_test.cpp", "net_netdb_test.cpp",
] ]
sources_smoke = [ sources_smoke = [
......
...@@ -64,8 +64,7 @@ sources_smoke = [ ...@@ -64,8 +64,7 @@ sources_smoke = [
"smoke/net_socket_test_013.cpp", "smoke/net_socket_test_013.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_net_socket_unittest_door") { unittest("liteos_a_net_socket_unittest_door") {
......
...@@ -46,8 +46,7 @@ sources_smoke = [ ...@@ -46,8 +46,7 @@ sources_smoke = [
"smoke/It_posix_mem_003.cpp", "smoke/It_posix_mem_003.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_posix_mem_unittest_door") { unittest("liteos_a_posix_mem_unittest_door") {
......
...@@ -70,7 +70,6 @@ sources_full = [ ...@@ -70,7 +70,6 @@ sources_full = [
"full/pthread_mutex_test_023.cpp", "full/pthread_mutex_test_023.cpp",
"full/pthread_mutex_test_024.cpp", "full/pthread_mutex_test_024.cpp",
"full/pthread_mutex_test_025.cpp", "full/pthread_mutex_test_025.cpp",
] ]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
......
...@@ -41,13 +41,9 @@ sources_entry = [ ...@@ -41,13 +41,9 @@ sources_entry = [
"process_rwlock_test.cpp", "process_rwlock_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/pthread_rwlock_test_001.cpp" ]
"smoke/pthread_rwlock_test_001.cpp",
]
sources_full = [ sources_full = [ "full/pthread_rwlock_test_002.cpp" ]
"full/pthread_rwlock_test_002.cpp",
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_rwlock_unittest_door") { unittest("liteos_a_rwlock_unittest_door") {
......
...@@ -41,12 +41,9 @@ sources_entry = [ ...@@ -41,12 +41,9 @@ sources_entry = [
"process_spinlock_test.cpp", "process_spinlock_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/pthread_spinlock_test_001.cpp" ]
"smoke/pthread_spinlock_test_001.cpp",
]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_spinlock_unittest_door") { unittest("liteos_a_spinlock_unittest_door") {
......
...@@ -41,12 +41,9 @@ sources_entry = [ ...@@ -41,12 +41,9 @@ sources_entry = [
"security_reugid_test.cpp", "security_reugid_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/reugid_test_001.cpp" ]
"smoke/reugid_test_001.cpp",
]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_security_reugid_unittest_door") { unittest("liteos_a_security_reugid_unittest_door") {
......
...@@ -41,12 +41,9 @@ sources_entry = [ ...@@ -41,12 +41,9 @@ sources_entry = [
"security_vid_test.cpp", "security_vid_test.cpp",
] ]
sources_smoke = [ sources_smoke = [ "smoke/vid_test_001.cpp" ]
"smoke/vid_test_001.cpp",
]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_security_vid_unittest_door") { unittest("liteos_a_security_vid_unittest_door") {
......
...@@ -51,7 +51,7 @@ sources_smoke = [ ...@@ -51,7 +51,7 @@ sources_smoke = [
"smoke/mkfifo_test_002.cpp", "smoke/mkfifo_test_002.cpp",
"smoke/pipe_test_002.cpp", "smoke/pipe_test_002.cpp",
"smoke/pipe_test_004.cpp", "smoke/pipe_test_004.cpp",
"smoke/signal_test_002.cpp", "smoke/signal_test_002.cpp",
"smoke/signal_test_009.cpp", "smoke/signal_test_009.cpp",
"smoke/signal_test_013.cpp", "smoke/signal_test_013.cpp",
...@@ -109,7 +109,6 @@ sources_full = [ ...@@ -109,7 +109,6 @@ sources_full = [
"full/pipe_test_003.cpp", "full/pipe_test_003.cpp",
"full/pipe_test_005.cpp", "full/pipe_test_005.cpp",
"full/pipe_test_006.cpp", "full/pipe_test_006.cpp",
] ]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
......
...@@ -51,8 +51,7 @@ sources_smoke = [ ...@@ -51,8 +51,7 @@ sources_smoke = [
"smoke/timer_test_tzset_002.cpp", "smoke/timer_test_tzset_002.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_time_timer_unittest_door") { unittest("liteos_a_time_timer_unittest_door") {
......
...@@ -48,8 +48,7 @@ sources_smoke = [ ...@@ -48,8 +48,7 @@ sources_smoke = [
"smoke/trace_test_004.cpp", "smoke/trace_test_004.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_trace_unittest_door") { unittest("liteos_a_trace_unittest_door") {
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
import("//build/lite/config/test.gni") import("//build/lite/config/test.gni")
import("../config.gni") import("../config.gni")
common_include_dirs = [ common_include_dirs = [
"//third_party/googletest/googletest/include", "//third_party/googletest/googletest/include",
"../common/include", "../common/include",
...@@ -55,8 +54,7 @@ sources_smoke = [ ...@@ -55,8 +54,7 @@ sources_smoke = [
"smoke/util_test_007.cpp", "smoke/util_test_007.cpp",
] ]
sources_full = [ sources_full = []
]
if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) { if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
unittest("liteos_a_util_unittest_door") { unittest("liteos_a_util_unittest_door") {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册