style: update

Signed-off-by: Zone.N <Zone.NiuZH@hotmail.com>
MRNIU · Jan 7, 2024 · 28a0b99 · 28a0b99
1 parent d05e452
commit 28a0b99
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 55 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 # 设置项目名与版本
 project(
-    test
-    VERSION 0.0.1
+        test
+        VERSION 0.0.1
 )
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/system_test)
@@ -18,31 +18,31 @@ if (TARGET_ARCH STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR)
     include(GoogleTest)
 
     list(APPEND DEFAULT_TEST_COMPILE_OPTIONS
-        --coverage
+            --coverage
     )
 
     list(APPEND DEFAULT_TEST_LINK_OPTIONS
-        --coverage
-        -fsanitize=leak
-        -fsanitize=address
-        -fno-omit-frame-pointer
+            --coverage
+            -fsanitize=leak
+            -fsanitize=address
+            -fno-omit-frame-pointer
     )
 
     list(APPEND DEFAULT_TEST_LINK_LIB
-        arch
-        driver
-        libc
-        libcxx
-        gtest_main
+            arch
+            driver
+            libc
+            libcxx
+            gtest_main
     )
 
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unit_test)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/integration_test)
 
     add_coverage_target(
-        DEPENDS unit_test integration_test
-        SOURCE_DIR ${CMAKE_SOURCE_DIR}
-        BINARY_DIR ${CMAKE_BINARY_DIR}
-        EXCLUDE_DIR ${CMAKE_SOURCE_DIR}/3rd/*
+            DEPENDS unit_test integration_test
+            SOURCE_DIR ${CMAKE_SOURCE_DIR}
+            BINARY_DIR ${CMAKE_BINARY_DIR}
+            EXCLUDE_DIR ${CMAKE_SOURCE_DIR}/3rd/*
     )
 endif ()
diff --git a/test/integration_test/CMakeLists.txt b/test/integration_test/CMakeLists.txt
@@ -6,24 +6,24 @@
 
 # 设置项目名与版本
 project(
-    integration-test
-    VERSION 0.0.1
+        integration-test
+        VERSION 0.0.1
 )
 
 add_executable(integration_test
-    example.cpp
+        example.cpp
 )
 
 target_compile_options(integration_test PRIVATE
-    ${DEFAULT_TEST_COMPILE_OPTIONS}
+        ${DEFAULT_TEST_COMPILE_OPTIONS}
 )
 
 target_link_options(integration_test PRIVATE
-    ${DEFAULT_TEST_LINK_OPTIONS}
+        ${DEFAULT_TEST_LINK_OPTIONS}
 )
 
 target_link_libraries(integration_test PRIVATE
-    ${DEFAULT_TEST_LINK_LIB}
+        ${DEFAULT_TEST_LINK_LIB}
 )
 
 gtest_discover_tests(integration_test)
diff --git a/test/system_test/CMakeLists.txt b/test/system_test/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 # 设置项目名与版本
 project(
-    system-test
-    VERSION 0.0.1
+        system-test
+        VERSION 0.0.1
 )
 
 if (${TARGET_ARCH} STREQUAL "x86_64" OR ${TARGET_ARCH} STREQUAL "aarch64")

diff --git a/test/system_test/gnu_efi_test/CMakeLists.txt b/test/system_test/gnu_efi_test/CMakeLists.txt
@@ -6,38 +6,38 @@
 
 # 设置项目名与版本
 project(
-    gnu-efi-test
-    VERSION 0.0.1
+        gnu-efi-test
+        VERSION 0.0.1
 )
 
 enable_language(CXX)
 
 add_executable(${PROJECT_NAME}_boot
-    boot.cpp
-    ${CMAKE_SOURCE_DIR}/src/boot/load_elf.cpp
-    ${CMAKE_SOURCE_DIR}/src/boot/ostream.cpp
-    ${CMAKE_SOURCE_DIR}/src/boot/graphics.cpp
-    ${CMAKE_SOURCE_DIR}/src/boot/memory.cpp
+        boot.cpp
+        ${CMAKE_SOURCE_DIR}/src/boot/load_elf.cpp
+        ${CMAKE_SOURCE_DIR}/src/boot/ostream.cpp
+        ${CMAKE_SOURCE_DIR}/src/boot/graphics.cpp
+        ${CMAKE_SOURCE_DIR}/src/boot/memory.cpp
 )
 
 add_header_project(${PROJECT_NAME}_boot)
 add_header_boot(${PROJECT_NAME}_boot)
 add_header_3rd(${PROJECT_NAME}_boot)
 
 target_compile_options(${PROJECT_NAME}_boot PRIVATE
-    ${DEFAULT_BOOT_COMPILE_OPTIONS}
+        ${DEFAULT_BOOT_COMPILE_OPTIONS}
 )
 
 target_link_options(${PROJECT_NAME}_boot PRIVATE
-    ${DEFAULT_BOOT_LINK_OPTIONS}
+        ${DEFAULT_BOOT_LINK_OPTIONS}
 )
 
 target_link_libraries(${PROJECT_NAME}_boot PRIVATE
-    ${DEFAULT_BOOT_LINK_LIB}
+        ${DEFAULT_BOOT_LINK_LIB}
 )
 
 add_dependencies(${PROJECT_NAME}_boot
-    ${COMPILE_DEPENDS}
+        ${COMPILE_DEPENDS}
 )
 
 set_target_properties(${PROJECT_NAME}_boot PROPERTIES PREFIX "")
@@ -53,17 +53,17 @@ objdump_D(${PROJECT_NAME}_boot)
 elf2efi(${PROJECT_NAME}_boot ${BOOT_EFI_OUTPUT_NAME})
 
 add_executable(${PROJECT_NAME}_kernel
-    main.cpp
+        main.cpp
 )
 
 add_header_kernel(${PROJECT_NAME}_kernel)
 
 target_compile_options(${PROJECT_NAME}_kernel PRIVATE
-    ${DEFAULT_KERNEL_COMPILE_OPTIONS}
+        ${DEFAULT_KERNEL_COMPILE_OPTIONS}
 )
 
 target_link_options(${PROJECT_NAME}_kernel PRIVATE
-    ${DEFAULT_KERNEL_LINK_OPTIONS}
+        ${DEFAULT_KERNEL_LINK_OPTIONS}
 )
 
 set_target_properties(${PROJECT_NAME}_kernel PROPERTIES PREFIX "")
@@ -77,10 +77,10 @@ objdump_D(${PROJECT_NAME}_kernel)
 
 # 添加 run 和 debug target
 add_run_target(NAME ${PROJECT_NAME}
-    DEPENDS ${PROJECT_NAME}_boot ${PROJECT_NAME}_kernel ${RUN_DEPENDS} ${DEBUG_DEPENDS}
-    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-    TARGET ${TARGET_ARCH}
-    BOOT ${BOOT_EFI_OUTPUT_NAME}
-    KERNEL $<TARGET_FILE:${PROJECT_NAME}_kernel>
+        DEPENDS ${PROJECT_NAME}_boot ${PROJECT_NAME}_kernel ${RUN_DEPENDS} ${DEBUG_DEPENDS}
+        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+        TARGET ${TARGET_ARCH}
+        BOOT ${BOOT_EFI_OUTPUT_NAME}
+        KERNEL $<TARGET_FILE:${PROJECT_NAME}_kernel>
         QEMU_FLAGS ${QEMU_FLAGS}
 )
diff --git a/test/system_test/opensbi_test/CMakeLists.txt b/test/system_test/opensbi_test/CMakeLists.txt
@@ -21,16 +21,17 @@ add_executable(${PROJECT_NAME}_kernel
 add_header_3rd(${PROJECT_NAME}_kernel)
 
 target_compile_options(${PROJECT_NAME}_kernel PRIVATE
-        -g -ggdb
-        -O0
-        -Wall -Wextra
+        ${DEFAULT_KERNEL_COMPILE_OPTIONS}
         -ffreestanding
 )
 
 target_link_options(${PROJECT_NAME}_kernel PRIVATE
-        -no-pie
-        -nostdlib
-        -T ${CMAKE_SOURCE_DIR}/src/kernel/arch/${TARGET_ARCH}/link.ld
+        ${DEFAULT_KERNEL_LINK_OPTIONS}
+)
+
+# 添加要链接的库
+target_link_libraries(kernel PRIVATE
+        ${DEFAULT_KERNEL_LINK_LIB}
 )
 
 add_dependencies(${PROJECT_NAME}_kernel

diff --git a/test/unit_test/CMakeLists.txt b/test/unit_test/CMakeLists.txt
@@ -6,24 +6,24 @@
 
 # 设置项目名与版本
 project(
-    unit-test
-    VERSION 0.0.1
+        unit-test
+        VERSION 0.0.1
 )
 
 add_executable(unit_test
-    example.cpp
+        example.cpp
 )
 
 target_compile_options(unit_test PRIVATE
-    ${DEFAULT_TEST_COMPILE_OPTIONS}
+        ${DEFAULT_TEST_COMPILE_OPTIONS}
 )
 
 target_link_options(unit_test PRIVATE
-    ${DEFAULT_TEST_LINK_OPTIONS}
+        ${DEFAULT_TEST_LINK_OPTIONS}
 )
 
 target_link_libraries(unit_test PRIVATE
-    ${DEFAULT_TEST_LINK_LIB}
+        ${DEFAULT_TEST_LINK_LIB}
 )
 
 gtest_discover_tests(unit_test)