Skip to content

Commit 48711ee

Browse files
Johnson-zsdeepin-bot[bot]
authored andcommitted
Revert "refactor: optimize file sorting implementation"
This reverts commit 0ec3e8e.
1 parent dee9cfb commit 48711ee

9 files changed

Lines changed: 30 additions & 908 deletions

File tree

autotests/dfm-io-tests/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,15 @@ endif()
99

1010
message(STATUS "Adding unit tests for ${IO_TEST_LIB}")
1111

12-
# 共享的测试入口点
13-
set(TEST_COMMON_SRCS
14-
${CMAKE_CURRENT_SOURCE_DIR}/test_main.cpp
15-
)
16-
17-
# 各测试类源文件(不含 main)
18-
set(TEST_CLASS_SRCS
19-
${CMAKE_CURRENT_SOURCE_DIR}/tst_dfm_io.cpp
20-
${CMAKE_CURRENT_SOURCE_DIR}/tst_dfilesorter.cpp
12+
# Collect test source files
13+
file(GLOB_RECURSE TEST_SRCS
14+
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
15+
${CMAKE_CURRENT_SOURCE_DIR}/*.h
2116
)
2217

2318
# Create the test executable
2419
add_executable(dfm-io-test
25-
${TEST_COMMON_SRCS}
26-
${TEST_CLASS_SRCS}
20+
${TEST_SRCS}
2721
)
2822

2923
# Link against the dfm-io library and Qt Test
@@ -33,11 +27,17 @@ target_link_libraries(dfm-io-test
3327
)
3428

3529
# Add include directories
36-
target_include_directories(dfm-io-test
37-
PRIVATE
38-
${CMAKE_SOURCE_DIR}/src/dfm-io/dfm-io
39-
${CMAKE_SOURCE_DIR}/src/dfm-io/dfm-io/sort
40-
)
30+
if(DFM_BUILD_WITH_QT6)
31+
target_include_directories(dfm-io-test
32+
PRIVATE
33+
${CMAKE_SOURCE_DIR}/src/dfm-io/dfm-io
34+
)
35+
else()
36+
target_include_directories(dfm-io-test
37+
PRIVATE
38+
${CMAKE_SOURCE_DIR}/src/dfm-io/dfm-io
39+
)
40+
endif()
4141

4242
# Register the test with CTest
4343
add_test(NAME dfm-io-test COMMAND dfm-io-test)

autotests/dfm-io-tests/test_main.cpp

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)