Skip to content

Commit 4e4e1af

Browse files
daverigbydaverigby
committed
MB-46000: Use cb_add_test_executable() for all test programs
Make use of the new cb_add_test_executable() CMake function to declare targets which are test programs, and not needed for a 'production' build. Change-Id: I01336eb2210136329c52fdd6fe38ebf13c394e10 Reviewed-on: http://review.couchbase.org/c/forestdb/+/155210 Tested-by: Build Bot <[email protected]> Reviewed-by: Trond Norbye <[email protected]>
1 parent 43c6128 commit 4e4e1af

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ target_link_libraries(forestdb_dump ${PTHREAD_LIB} ${LIBM} ${SNAPPY_LIBRARIES}
255255
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
256256
set_target_properties(forestdb_dump PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
257257

258-
add_executable(forestdb_hexamine
258+
cb_add_test_executable(forestdb_hexamine
259259
tools/dump_common.cc
260260
tools/forestdb_hexamine.cc
261261
${FORESTDB_FILE_OPS}

‎tests/anomaly/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ add_library(FDB_TOOLS_CCORE OBJECT ${FORESTDB_COMMON_CORE_SRC})
3737
set_target_properties(FDB_TOOLS_CCORE PROPERTIES
3838
COMPILE_FLAGS "-D_FDB_TOOLS ${CB_GNU_CXX11_OPTION}")
3939

40-
add_executable(fdb_anomaly_test
40+
cb_add_test_executable(fdb_anomaly_test
4141
$<TARGET_OBJECTS:FDB_TOOLS_CCORE>
4242
filemgr_anomalous_ops.cc
4343
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
@@ -51,7 +51,7 @@ target_link_libraries(fdb_anomaly_test ${PTHREAD_LIB} ${LIBM}
5151
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
5252
set_target_properties(fdb_anomaly_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
5353

54-
add_executable(disk_sim_test
54+
cb_add_test_executable(disk_sim_test
5555
$<TARGET_OBJECTS:FDB_TOOLS_CCORE>
5656
filemgr_anomalous_ops.cc
5757
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}

‎tests/e2e/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_executable(e2etest
1+
cb_add_test_executable(e2etest
22
e2etest.cc
33
e2espec.cc
44
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}

‎tests/fdbench-micro/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_executable(fdb_microbench
1+
cb_add_test_executable(fdb_microbench
22
fdb_bench.cc
33
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
44
$<TARGET_OBJECTS:FDB_TOOLS_CORE>

‎tests/functional/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_executable(fdb_functional_test
1+
cb_add_test_executable(fdb_functional_test
22
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
33
fdb_functional_test.cc
44
functional_util.cc
@@ -12,7 +12,7 @@ target_link_libraries(fdb_functional_test ${PTHREAD_LIB} ${LIBM}
1212
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
1313
set_target_properties(fdb_functional_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
1414

15-
add_executable(fdb_extended_test
15+
cb_add_test_executable(fdb_extended_test
1616
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
1717
fdb_extended_test.cc
1818
functional_util.cc
@@ -26,7 +26,7 @@ target_link_libraries(fdb_extended_test ${PTHREAD_LIB} ${LIBM}
2626
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
2727
set_target_properties(fdb_extended_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
2828

29-
add_executable(compact_functional_test
29+
cb_add_test_executable(compact_functional_test
3030
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
3131
compact_functional_test.cc
3232
functional_util.cc
@@ -40,7 +40,7 @@ target_link_libraries(compact_functional_test ${PTHREAD_LIB} ${LIBM}
4040
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
4141
set_target_properties(compact_functional_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
4242

43-
add_executable(iterator_functional_test
43+
cb_add_test_executable(iterator_functional_test
4444
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
4545
iterator_functional_test.cc
4646
functional_util.cc
@@ -54,7 +54,7 @@ target_link_libraries(iterator_functional_test ${PTHREAD_LIB} ${LIBM}
5454
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
5555
set_target_properties(iterator_functional_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
5656

57-
add_executable(mvcc_functional_test
57+
cb_add_test_executable(mvcc_functional_test
5858
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
5959
mvcc_functional_test.cc
6060
functional_util.cc
@@ -68,7 +68,7 @@ target_link_libraries(mvcc_functional_test ${PTHREAD_LIB} ${LIBM}
6868
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
6969
set_target_properties(mvcc_functional_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
7070

71-
add_executable(multi_kv_functional_test
71+
cb_add_test_executable(multi_kv_functional_test
7272
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
7373
multi_kv_functional_test.cc
7474
functional_util.cc
@@ -82,7 +82,7 @@ target_link_libraries(multi_kv_functional_test ${PTHREAD_LIB} ${LIBM}
8282
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
8383
set_target_properties(multi_kv_functional_test PROPERTIES COMPILE_FLAGS "-D_FDB_TOOLS")
8484

85-
add_executable(big_concurrency_test
85+
cb_add_test_executable(big_concurrency_test
8686
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
8787
big_concurrency_test.cc
8888
${GETTIMEOFDAY_VS}
@@ -96,7 +96,7 @@ target_link_libraries(big_concurrency_test ${PTHREAD_LIB} ${LIBM}
9696
set_target_properties(big_concurrency_test PROPERTIES COMPILE_FLAGS
9797
"-D_FDB_TOOLS")
9898

99-
add_executable(big_compaction_test
99+
cb_add_test_executable(big_compaction_test
100100
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
101101
big_compaction_test.cc
102102
${GETTIMEOFDAY_VS}
@@ -110,7 +110,7 @@ target_link_libraries(big_compaction_test ${PTHREAD_LIB} ${LIBM}
110110
set_target_properties(big_compaction_test PROPERTIES COMPILE_FLAGS
111111
"-D_FDB_TOOLS")
112112

113-
add_executable(staleblock_test
113+
cb_add_test_executable(staleblock_test
114114
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
115115
staleblock_test.cc
116116
functional_util.cc

‎tests/unit/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_executable(hash_test
1+
cb_add_test_executable(hash_test
22
${ROOT_SRC}/avltree.cc
33
${ROOT_SRC}/hash.cc
44
${ROOT_SRC}/hash_functions.cc
@@ -8,7 +8,7 @@ add_executable(hash_test
88
${ROOT_UTILS}/memleak.cc)
99
target_link_libraries(hash_test ${PTHREAD_LIB} ${LIBM} ${MALLOC_LIBRARIES})
1010

11-
add_executable(bcache_test
11+
cb_add_test_executable(bcache_test
1212
bcache_test.cc
1313
${ROOT_SRC}/avltree.cc
1414
${ROOT_SRC}/bgflusher.cc
@@ -38,12 +38,12 @@ target_link_libraries(bcache_test ${PTHREAD_LIB} ${LIBM}
3838
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
3939
set_target_properties(bcache_test PROPERTIES COMPILE_FLAGS "${CB_GNU_CXX11_OPTION}")
4040

41-
add_executable(atomic_test
41+
cb_add_test_executable(atomic_test
4242
atomic_test.cc
4343
${GETTIMEOFDAY_VS})
4444
target_link_libraries(atomic_test ${PTHREAD_LIB} ${LIBM})
4545

46-
add_executable(filemgr_test
46+
cb_add_test_executable(filemgr_test
4747
filemgr_test.cc
4848
${ROOT_SRC}/avltree.cc
4949
${ROOT_SRC}/bgflusher.cc
@@ -73,7 +73,7 @@ target_link_libraries(filemgr_test ${PTHREAD_LIB} ${LIBM}
7373
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
7474
set_target_properties(filemgr_test PROPERTIES COMPILE_FLAGS "${CB_GNU_CXX11_OPTION}")
7575

76-
add_executable(btreeblock_test
76+
cb_add_test_executable(btreeblock_test
7777
btreeblock_test.cc
7878
${ROOT_SRC}/avltree.cc
7979
${ROOT_SRC}/bgflusher.cc
@@ -106,7 +106,7 @@ target_link_libraries(btreeblock_test ${PTHREAD_LIB} ${LIBM}
106106
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
107107
set_target_properties(btreeblock_test PROPERTIES COMPILE_FLAGS "${CB_GNU_CXX11_OPTION}")
108108

109-
add_executable(docio_test
109+
cb_add_test_executable(docio_test
110110
docio_test.cc
111111
${ROOT_SRC}/avltree.cc
112112
${ROOT_SRC}/bgflusher.cc
@@ -137,7 +137,7 @@ target_link_libraries(docio_test ${PTHREAD_LIB} ${LIBM} ${SNAPPY_LIBRARIES}
137137
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
138138
set_target_properties(docio_test PROPERTIES COMPILE_FLAGS "${CB_GNU_CXX11_OPTION}")
139139

140-
add_executable(hbtrie_test
140+
cb_add_test_executable(hbtrie_test
141141
hbtrie_test.cc
142142
${ROOT_SRC}/avltree.cc
143143
${ROOT_SRC}/bgflusher.cc
@@ -173,15 +173,15 @@ target_link_libraries(hbtrie_test ${PTHREAD_LIB} ${LIBM} ${SNAPPY_LIBRARIES}
173173
${DL_LIBRARIES} ${BREAKPAD_LIBRARIES})
174174
set_target_properties(hbtrie_test PROPERTIES COMPILE_FLAGS "${CB_GNU_CXX11_OPTION}")
175175

176-
add_executable(btree_str_kv_test
176+
cb_add_test_executable(btree_str_kv_test
177177
btree_str_kv_test.cc
178178
${ROOT_SRC}/btree_str_kv.cc
179179
${ROOT_SRC}/avltree.cc
180180
${GETTIMEOFDAY_VS}
181181
${ROOT_UTILS}/memleak.cc)
182182
target_link_libraries(btree_str_kv_test ${LIBM} ${MALLOC_LIBRARIES})
183183

184-
add_executable(btree_kv_test
184+
cb_add_test_executable(btree_kv_test
185185
btree_kv_test.cc
186186
${ROOT_SRC}/btree_kv.cc
187187
${ROOT_SRC}/avltree.cc

‎tests/usecase/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
add_executable(usecase_test
1+
cb_add_test_executable(usecase_test
22
usecase_test.cc
33
${PROJECT_SOURCE_DIR}/${FORESTDB_FILE_OPS}
44
$<TARGET_OBJECTS:FDB_TOOLS_CORE>

0 commit comments

Comments
 (0)