Skip to content

Commit 5e74b7c

Browse files
hummeltechhummeltech
committed
Organizing
1 parent 543a575 commit 5e74b7c

10 files changed

Lines changed: 1175 additions & 1375 deletions

‎src/CMakeLists.txt‎

Lines changed: 10 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -223,142 +223,26 @@ target_link_libraries(gen_tile_test ${gen_tile_test_LIBS})
223223

224224
#-----------------------------------------------------------------------------
225225
#
226-
# unit_test_cache_expire
226+
# unit_tests
227227
#
228228
#-----------------------------------------------------------------------------
229229

230-
set(unit_test_cache_expire_SRCS
230+
set(unit_tests_SRCS
231231
$<TARGET_OBJECTS:catch_main_o>
232-
${PROJECT_SOURCE_DIR}/tests/unit_test_cache_expire.cpp
232+
${PROJECT_SOURCE_DIR}/tests/unit_tests.cpp
233233
)
234-
set(unit_test_cache_expire_LIBS
235-
${GLIB_LIBRARIES}
236-
)
237-
add_executable(unit_test_cache_expire ${unit_test_cache_expire_SRCS})
238-
set_target_properties(unit_test_cache_expire PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
239-
target_include_directories(unit_test_cache_expire PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
240-
target_link_libraries(unit_test_cache_expire ${unit_test_cache_expire_LIBS})
241-
242-
243-
#-----------------------------------------------------------------------------
244-
#
245-
# unit_test_metatile
246-
#
247-
#-----------------------------------------------------------------------------
248-
249-
set(unit_test_metatile_SRCS
250-
$<TARGET_OBJECTS:catch_main_o>
251-
${PROJECT_SOURCE_DIR}/tests/unit_test_metatile.cpp
252-
)
253-
set(unit_test_metatile_LIBS
254-
${GLIB_LIBRARIES}
255-
)
256-
add_executable(unit_test_metatile ${unit_test_metatile_SRCS})
257-
set_target_properties(unit_test_metatile PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
258-
target_include_directories(unit_test_metatile PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
259-
target_link_libraries(unit_test_metatile ${unit_test_metatile_LIBS})
260-
261-
262-
#-----------------------------------------------------------------------------
263-
#
264-
# unit_test_parameterize_style
265-
#
266-
#-----------------------------------------------------------------------------
267-
268-
set(unit_test_parameterize_style_SRCS
269-
$<TARGET_OBJECTS:catch_main_o>
270-
${PROJECT_SOURCE_DIR}/tests/unit_test_parameterize_style.cpp
271-
)
272-
set(unit_test_parameterize_style_LIBS
234+
set(unit_tests_LIBS
273235
${GLIB_LIBRARIES}
236+
${INIPARSER_LIBRARIES}
274237
${LIBMAPNIK_LIBRARIES}
275238
)
276-
add_executable(unit_test_parameterize_style ${unit_test_parameterize_style_SRCS})
277-
set_target_properties(unit_test_parameterize_style PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
278-
target_compile_definitions(unit_test_parameterize_style PRIVATE
239+
add_executable(unit_tests ${unit_tests_SRCS})
240+
set_target_properties(unit_tests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
241+
target_compile_definitions(unit_tests PRIVATE
279242
MAPNIK_XML="${PROJECT_SOURCE_DIR}/utils/example-map/mapnik.xml"
280-
)
281-
target_include_directories(unit_test_parameterize_style PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
282-
target_link_libraries(unit_test_parameterize_style ${unit_test_parameterize_style_LIBS})
283-
284-
285-
#-----------------------------------------------------------------------------
286-
#
287-
# unit_test_protocol_helper
288-
#
289-
#-----------------------------------------------------------------------------
290-
291-
set(unit_test_protocol_helper_SRCS
292-
$<TARGET_OBJECTS:catch_main_o>
293-
${PROJECT_SOURCE_DIR}/tests/unit_test_protocol_helper.cpp
294-
)
295-
set(unit_test_protocol_helper_LIBS
296-
${GLIB_LIBRARIES}
297-
)
298-
add_executable(unit_test_protocol_helper ${unit_test_protocol_helper_SRCS})
299-
set_target_properties(unit_test_protocol_helper PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
300-
target_include_directories(unit_test_protocol_helper PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
301-
target_link_libraries(unit_test_protocol_helper ${unit_test_protocol_helper_LIBS})
302-
303-
304-
#-----------------------------------------------------------------------------
305-
#
306-
# unit_test_render_submit_queue
307-
#
308-
#-----------------------------------------------------------------------------
309-
310-
set(unit_test_render_submit_queue_SRCS
311-
$<TARGET_OBJECTS:catch_main_o>
312-
${PROJECT_SOURCE_DIR}/tests/unit_test_render_submit_queue.cpp
313-
)
314-
set(unit_test_render_submit_queue_LIBS
315-
${GLIB_LIBRARIES}
316-
)
317-
add_executable(unit_test_render_submit_queue ${unit_test_render_submit_queue_SRCS})
318-
set_target_properties(unit_test_render_submit_queue PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
319-
target_include_directories(unit_test_render_submit_queue PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
320-
target_link_libraries(unit_test_render_submit_queue ${unit_test_render_submit_queue_LIBS})
321-
322-
323-
#-----------------------------------------------------------------------------
324-
#
325-
# unit_test_renderd_config
326-
#
327-
#-----------------------------------------------------------------------------
328-
329-
set(unit_test_renderd_config_SRCS
330-
$<TARGET_OBJECTS:catch_main_o>
331-
${PROJECT_SOURCE_DIR}/tests/unit_test_renderd_config.cpp
332-
)
333-
set(unit_test_renderd_config_LIBS
334-
${GLIB_LIBRARIES}
335-
${INIPARSER_LIBRARIES}
336-
)
337-
add_executable(unit_test_renderd_config ${unit_test_renderd_config_SRCS})
338-
set_target_properties(unit_test_renderd_config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
339-
target_compile_definitions(unit_test_renderd_config PRIVATE
340243
RENDERD_CONF="${PROJECT_SOURCE_DIR}/etc/renderd/renderd.conf.examples"
341244
)
342-
target_include_directories(unit_test_renderd_config PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
343-
target_link_libraries(unit_test_renderd_config ${unit_test_renderd_config_LIBS})
344-
345-
346-
#-----------------------------------------------------------------------------
347-
#
348-
# unit_test_sys_utils
349-
#
350-
#-----------------------------------------------------------------------------
351-
352-
set(unit_test_sys_utils_SRCS
353-
$<TARGET_OBJECTS:catch_main_o>
354-
${PROJECT_SOURCE_DIR}/tests/unit_test_sys_utils.cpp
355-
)
356-
set(unit_test_sys_utils_LIBS
357-
${GLIB_LIBRARIES}
358-
)
359-
add_executable(unit_test_sys_utils ${unit_test_sys_utils_SRCS})
360-
set_target_properties(unit_test_sys_utils PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
361-
target_include_directories(unit_test_sys_utils PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
362-
target_link_libraries(unit_test_sys_utils ${unit_test_sys_utils_LIBS})
245+
target_include_directories(unit_tests PRIVATE ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/tests)
246+
target_link_libraries(unit_tests ${unit_tests_LIBS})
363247

364248
endif()

‎tests/CMakeLists.txt‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -221,38 +221,8 @@ add_test(
221221
)
222222

223223
add_test(
224-
NAME unit_test_cache_expire
225-
COMMAND unit_test_cache_expire
226-
)
227-
228-
add_test(
229-
NAME unit_test_metatile
230-
COMMAND unit_test_metatile
231-
)
232-
233-
add_test(
234-
NAME unit_test_parameterize_style
235-
COMMAND unit_test_parameterize_style
236-
)
237-
238-
add_test(
239-
NAME unit_test_protocol_helper
240-
COMMAND unit_test_protocol_helper
241-
)
242-
243-
add_test(
244-
NAME unit_test_render_submit_queue
245-
COMMAND unit_test_render_submit_queue
246-
)
247-
248-
add_test(
249-
NAME unit_test_renderd_config
250-
COMMAND unit_test_renderd_config
251-
)
252-
253-
add_test(
254-
NAME unit_test_sys_utils
255-
COMMAND unit_test_sys_utils
224+
NAME unit_tests
225+
COMMAND unit_tests
256226
)
257227

258228
foreach(STORAGE_BACKEND_INDEX RANGE ${STORAGE_BACKENDS_LENGTH})

0 commit comments

Comments
 (0)