Skip to content

Commit 6557398

Browse files
committed
build: comment out test execution in CMakeLists.txt and enable testing for MSVC
1 parent c9e97f6 commit 6557398

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ endif()
2929
option(CPPJIEBA_BUILD_TESTS "Build cppjieba tests" ${CPPJIEBA_TOP_LEVEL_PROJECT})
3030

3131
if(CPPJIEBA_BUILD_TESTS)
32-
ENABLE_TESTING()
32+
#ENABLE_TESTING()
3333

3434
ADD_SUBDIRECTORY(test)
35-
if(NOT MSVC)
36-
ADD_TEST(NAME ./test/test.run COMMAND ./test/test.run)
37-
ADD_TEST(NAME ./load_test COMMAND ./load_test)
38-
endif()
35+
#if(NOT MSVC)
36+
# ADD_TEST(NAME ./test/test.run COMMAND ./test/test.run)
37+
# ADD_TEST(NAME ./load_test COMMAND ./load_test)
38+
#endif()
3939
endif()
4040

4141

test/unittest/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
1818

1919
ADD_DEFINITIONS(-DLOGGING_LEVEL=LL_WARNING)
2020

21+
if(MSVC)
22+
add_compile_options(/utf-8)
23+
endif()
24+
2125
ADD_EXECUTABLE(test.run
2226
gtest_main.cpp
2327
keyword_extractor_test.cpp
@@ -31,3 +35,6 @@ ADD_EXECUTABLE(test.run
3135
)
3236

3337
TARGET_LINK_LIBRARIES(test.run gtest)
38+
39+
enable_testing()
40+
add_test(NAME test.run COMMAND test.run WORKING_DIRECTORY ${CMAKE_BINARY_DIR})

0 commit comments

Comments
 (0)