Skip to content

Commit c4c0495

Browse files
committed
cmake: use add_Test(NAME .. COMMAND ..) to support commands with executable target
1 parent ccac55a commit c4c0495

File tree

15 files changed

+24
-24
lines changed

15 files changed

+24
-24
lines changed

external/hash/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ add_executable (load_test_d_rh load_test.c ptr_set.c cmetrohash64.c)
2929
target_compile_definitions(load_test_rh PRIVATE
3030
-DPTR_SET_RH)
3131

32-
add_test(hash_test hash_test)
33-
add_test(hash_test_32 hash_test_32)
34-
add_test(hash_test_rh hash_test_rh)
35-
add_test(load_test load_test)
36-
add_test(load_test_rh load_test_rh)
32+
add_test(NAME hash_test COMMAND hash_test)
33+
add_test(NAME hash_test_32 COMMAND hash_test_32)
34+
add_test(NAME hash_test_rh COMMAND hash_test_rh)
35+
add_test(NAME load_test COMMAND load_test)
36+
add_test(NAME load_test_rh COMMAND load_test_rh)
3737

3838
enable_testing()

samples/monster/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ add_executable(monster monster.c "${GEN_DIR}/monster_builder.h")
1616
target_link_libraries(monster flatcc::runtime)
1717

1818
if (FLATCC_TEST)
19-
add_test(monster monster)
19+
add_test(NAME monster COMMAND monster)
2020
endif()

samples/reflection/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ add_executable(bfbs2json bfbs2json.c)
2828
target_link_libraries(bfbs2json flatcc::runtime)
2929

3030
if (FLATCC_TEST)
31-
add_test(bfbs2json bfbs2json "${GEN_DIR}/monster.bfbs")
31+
add_test(NAME bfbs2json COMMAND bfbs2json "${GEN_DIR}/monster.bfbs")
3232
endif()

test/cgen_test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ target_link_libraries(cgen_test
88
flatcc::libflatcc
99
)
1010

11-
add_test(cgen_test cgen_test)
11+
add_test(NAME cgen_test COMMAND cgen_test)
1212

1313

1414
# Compilation of the generated code tests many import edge cases
@@ -37,5 +37,5 @@ if(${CMAKE_MAKE_PROGRAM} MATCHES make)
3737
# visible so build fails on <assert.h> not found in the custom build
3838
# stage where CMAKE_C_COMPILER uses a compiler call that has this
3939
# behavior
40-
#add_test(test_generated ${CMAKE_MAKE_PROGRAM} test_generated)
40+
#add_test(NAME test_generated COMMAND ${CMAKE_MAKE_PROGRAM} test_generated)
4141
endif(${CMAKE_MAKE_PROGRAM} MATCHES make)

test/emit_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ add_custom_command (
1515
add_executable(emit_test emit_test.c "${GEN_DIR}/emit_test_builder.h")
1616
target_link_libraries(emit_test flatcc::runtime)
1717

18-
add_test(emit_test emit_test)
18+
add_test(NAME emit_test COMMAND emit_test)

test/flatc_compat/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ add_custom_command (
1919
add_executable(flatc_compat flatc_compat.c "${GEN_DIR}/monster_test_reader.h" "${GEN_DIR}/monster_test_verifier.h")
2020
target_link_libraries(flatc_compat flatcc::runtime)
2121

22-
add_test(flatc_compat flatc_compat)
22+
add_test(NAME flatc_compat COMMAND flatc_compat)

test/json_test/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ target_link_libraries(test_json_parser PRIVATE flatcc::runtime)
3737
target_link_libraries(test_json_printer PRIVATE flatcc::runtime)
3838
target_link_libraries(test_json PRIVATE flatcc::runtime)
3939

40-
add_test(test_basic_parse test_basic_parse)
41-
add_test(test_json_parser test_json_parser)
42-
add_test(test_json_printer test_json_printer)
43-
add_test(test_json test_json)
40+
add_test(NAME test_basic_parse COMMAND test_basic_parse)
41+
add_test(NAME test_json_parser COMMAND test_json_parser)
42+
add_test(NAME test_json_printer COMMAND test_json_printer)
43+
add_test(NAME test_json COMMAND test_json)
4444

4545
# Compile without default library in order to test various runtime flags
4646
set(RTPATH "${PROJECT_SOURCE_DIR}/src/runtime")
@@ -57,7 +57,7 @@ macro(jstest trg flags)
5757
add_executable(${trg} test_json.c ${RTSRC} "${GEN_DIR}/monster_test_json_parser.h"
5858
"${GEN_DIR}/monster_test_json_printer.h" "${GEN_DIR}/monster_test_verifier.h")
5959
target_include_directories(${trg} PRIVATE ${PROJECT_SOURCE_DIR}/include)
60-
add_test(${trg} ${trg})
60+
add_test(NAME ${trg} COMMAND ${trg})
6161
set_target_properties(${trg} PROPERTIES COMPILE_FLAGS ${flags})
6262
endmacro()
6363

test/load_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ add_custom_command(
1818
add_executable(load_test load_test.c "${GEN_DIR}/monster_test_builder.h")
1919
target_link_libraries(load_test flatcc::runtime)
2020

21-
add_test(load_test load_test)
21+
add_test(NAME load_test COMMAND load_test)
2222

test/monster_test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ add_custom_command (
2121
add_executable(monster_test monster_test.c "${GEN_DIR}/monster_test_builder.h" "${GEN_DIR}/monster_test_verifier.h")
2222
target_link_libraries(monster_test flatcc::runtime)
2323

24-
add_test(monster_test monster_test)
24+
add_test(NAME monster_test COMMAND monster_test)

test/monster_test_concat/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ add_custom_command (
1717
add_executable(monster_test_concat monster_test_concat.c "${GEN_DIR}/monster_test.h")
1818
target_link_libraries(monster_test_concat flatcc::runtime)
1919

20-
add_test(monster_test_concat monster_test_concat)
20+
add_test(NAME monster_test_concat COMMAND monster_test_concat)

0 commit comments

Comments
 (0)