From 9d893d6d4d18ba44515b5f6afc7e0347e6d486ef Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Wed, 16 Mar 2016 11:58:39 +0100 Subject: [PATCH] Library tests build system integration --- CMakeLists.txt | 6 +++++- unit_tests/library/match.cpp | 8 ++++++++ unit_tests/library/route.cpp | 8 ++++++++ unit_tests/library/tile.cpp | 8 ++++++++ unit_tests/library/trip.cpp | 8 ++++++++ unit_tests/library_tests.cpp | 7 +++++++ 6 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 unit_tests/library/match.cpp create mode 100644 unit_tests/library/route.cpp create mode 100644 unit_tests/library/tile.cpp create mode 100644 unit_tests/library/trip.cpp create mode 100644 unit_tests/library_tests.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index d134b7b76..af86d55b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} COMMENT "Configuring revision fingerprint" VERBATIM) -add_custom_target(tests DEPENDS engine-tests extractor-tests util-tests server-tests) +add_custom_target(tests DEPENDS engine-tests extractor-tests util-tests server-tests library-tests) add_custom_target(benchmarks DEPENDS rtree-bench) set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread unit_test_framework) @@ -64,6 +64,7 @@ file(GLOB ExtractorTestsGlob unit_tests/extractor/*.cpp) file(GLOB EngineTestsGlob unit_tests/engine/*.cpp) file(GLOB UtilTestsGlob unit_tests/util/*.cpp) file(GLOB ServerTestsGlob unit_tests/server/*.cpp) +file(GLOB LibraryTestsGlob unit_tests/library/*.cpp) file(GLOB IOTestsGlob unit_tests/io/*.cpp) add_library(UTIL OBJECT ${UtilGlob}) @@ -90,12 +91,14 @@ add_executable(engine-tests EXCLUDE_FROM_ALL unit_tests/engine_tests.cpp ${Engin add_executable(extractor-tests EXCLUDE_FROM_ALL unit_tests/extractor_tests.cpp ${ExtractorTestsGlob} $ $) add_executable(util-tests EXCLUDE_FROM_ALL unit_tests/util_tests.cpp ${UtilTestsGlob} $) add_executable(server-tests EXCLUDE_FROM_ALL unit_tests/server_tests.cpp ${ServerTestsGlob} $ $) +add_executable(library-tests EXCLUDE_FROM_ALL unit_tests/library_tests.cpp ${LibraryTestsGlob}) # Benchmarks add_executable(rtree-bench EXCLUDE_FROM_ALL src/benchmarks/static_rtree.cpp $) target_include_directories(engine-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests) target_include_directories(util-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests) +target_include_directories(library-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/) target_include_directories(rtree-bench PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests) # Check the release mode @@ -339,6 +342,7 @@ target_link_libraries(server-tests osrm ${Boost_LIBRARIES}) target_link_libraries(extractor-tests ${EXTRACTOR_LIBRARIES}) target_link_libraries(rtree-bench ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${TBB_LIBRARIES}) target_link_libraries(util-tests ${UTIL_LIBRARIES}) +target_link_libraries(library-tests osrm) if(BUILD_TOOLS) message(STATUS "Activating OSRM internal tools") diff --git a/unit_tests/library/match.cpp b/unit_tests/library/match.cpp new file mode 100644 index 000000000..938c92f1d --- /dev/null +++ b/unit_tests/library/match.cpp @@ -0,0 +1,8 @@ +#include +#include + +BOOST_AUTO_TEST_SUITE(match) + +BOOST_AUTO_TEST_CASE(test_match) {} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/unit_tests/library/route.cpp b/unit_tests/library/route.cpp new file mode 100644 index 000000000..799924de3 --- /dev/null +++ b/unit_tests/library/route.cpp @@ -0,0 +1,8 @@ +#include +#include + +BOOST_AUTO_TEST_SUITE(route) + +BOOST_AUTO_TEST_CASE(test_route) {} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/unit_tests/library/tile.cpp b/unit_tests/library/tile.cpp new file mode 100644 index 000000000..391cf1db6 --- /dev/null +++ b/unit_tests/library/tile.cpp @@ -0,0 +1,8 @@ +#include +#include + +BOOST_AUTO_TEST_SUITE(tile) + +BOOST_AUTO_TEST_CASE(test_tile) {} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/unit_tests/library/trip.cpp b/unit_tests/library/trip.cpp new file mode 100644 index 000000000..382d2e098 --- /dev/null +++ b/unit_tests/library/trip.cpp @@ -0,0 +1,8 @@ +#include +#include + +BOOST_AUTO_TEST_SUITE(trip) + +BOOST_AUTO_TEST_CASE(test_trip) {} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/unit_tests/library_tests.cpp b/unit_tests/library_tests.cpp new file mode 100644 index 000000000..6f7535616 --- /dev/null +++ b/unit_tests/library_tests.cpp @@ -0,0 +1,7 @@ +#define BOOST_TEST_MODULE library tests + +#include + +/* + * This file will contain an automatically generated main function. + */