From 48facd89d0d2e7faea881a212081e8fffbfa715e Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Thu, 21 Mar 2019 18:08:05 -0400 Subject: [PATCH] Fixing test build on gcc --- CMakeLists.txt | 8 +++++--- appveyor.yml | 2 ++ tests/CMakeLists.txt | 2 +- tests/outfile/CMakeLists.txt | 14 +++++++++++--- tests/outfile/data/example1.out | Bin 0 -> 16832 bytes tests/outfile/test_output.cpp | 6 ------ tests/test_analysis.cpp | 2 +- tests/test_control.cpp | 2 -- tests/test_demand.cpp | 1 - tests/test_hydraulics.cpp | 1 - tests/test_link.cpp | 1 - tests/test_net_builder.cpp | 1 - tests/test_node.cpp | 1 - tests/test_pattern.cpp | 1 - tests/test_project.cpp | 2 -- tests/test_quality.cpp | 1 - tests/test_reent.cpp | 5 ++--- tests/test_report.cpp | 1 - tests/test_toolkit.cpp | 2 -- tests/util/CMakeLists.txt | 17 +++++++++++++++-- tests/util/test_errormanager.cpp | 20 ++++++++++---------- 21 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 tests/outfile/data/example1.out diff --git a/CMakeLists.txt b/CMakeLists.txt index 499b1e4..4bf4748 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,12 +28,12 @@ cmake_minimum_required (VERSION 2.8.8) project(EPANET) +include(CTest) # Append local dir to module search path list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) -option(BUILD_TESTS "Build unit tests (requires Boost test)" OFF) option(BUILD_PY_LIB "Build library for Python wrapper" OFF) option(BUILD_COVERAGE "Build library for coverage" OFF) @@ -43,10 +43,12 @@ IF (NOT BUILD_PY_LIB) ENDIF (NOT BUILD_PY_LIB) add_subdirectory(src/outfile) -IF (BUILD_TESTS) +IF (BUILD_TESTING) + enable_testing() add_subdirectory(tests) add_subdirectory(tests/outfile) -ENDIF (BUILD_TESTS) + add_subdirectory(tests/util) +ENDIF (BUILD_TESTING) # Sets for output directory for executables and libraries. diff --git a/appveyor.yml b/appveyor.yml index 7db9355..c02546e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,7 @@ environment: GENERATOR: "Visual Studio 15 2017" GROUP: "SUPPORTED" BOOST_ROOT: "C:/Libraries/boost_1_67_0" + PLATFORM: "win32" REF_BUILD_ID: "220dev5" # New build on Visual Studio 15 2017 @@ -37,6 +38,7 @@ init: - set EPANET_HOME=%APPVEYOR_BUILD_FOLDER% - set BUILD_HOME=buildprod - set TEST_HOME=nrtestsuite + - set PATH=%PATH%;%BOOST_ROOT%/ # See values set - echo %APPVEYOR_BUILD_WORKER_IMAGE% diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 375561c..12807c1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -12,7 +12,6 @@ #Setup CMake to run tests enable_testing() - # Sets for output directory for executables and libraries. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) @@ -25,6 +24,7 @@ IF(MSVC) set(Boost_DEBUG OFF) set(Boost_DETAILED_FAILURE_MSG OFF) set(Boost_USE_STATIC_LIBS OFF) + add_definitions(-DBOOST_ALL_DYN_LINK) ENDIF(MSVC) set(Boost_THREAD_FOUND OFF) diff --git a/tests/outfile/CMakeLists.txt b/tests/outfile/CMakeLists.txt index e7c2de7..b14bb84 100644 --- a/tests/outfile/CMakeLists.txt +++ b/tests/outfile/CMakeLists.txt @@ -9,11 +9,19 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set (Boost_USE_STATIC_LIBS OFF) +if (MSVC) + set (Boost_USE_STATIC_LIBS OFF) + add_definitions(-DBOOST_ALL_DYN_LINK) +endif(MSVC) + find_package(Boost COMPONENTS unit_test_framework) include_directories (${Boost_INCLUDE_DIRS} ../../src/outfile/include) -add_executable(test_errormanager test_output.cpp) +add_executable(test_output test_output.cpp) -target_link_libraries(test_errormanager ${Boost_LIBRARIES} epanet-output) +target_link_libraries(test_output ${Boost_LIBRARIES} epanet-output) + +add_test(NAME test_output + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_output + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data) diff --git a/tests/outfile/data/example1.out b/tests/outfile/data/example1.out new file mode 100644 index 0000000000000000000000000000000000000000..416c98bde53c34b136525b364ade3842ec5d0f1d GIT binary patch literal 16832 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 literal 0 HcmV?d00001 diff --git a/tests/outfile/test_output.cpp b/tests/outfile/test_output.cpp index eb381b2..bcae21d 100644 --- a/tests/outfile/test_output.cpp +++ b/tests/outfile/test_output.cpp @@ -8,13 +8,7 @@ * Unit testing for EPANET Output API. */ -// NOTE: Travis installs libboost test version 1.5.4 -// NOTE: Can not dyn link boost using Visual Studio 10 2010 -//#define BOOST_TEST_DYN_LINK - - #define BOOST_TEST_MODULE "output" -#define BOOST_TEST_DYN_LINK #include #include diff --git a/tests/test_analysis.cpp b/tests/test_analysis.cpp index 2b1e367..f7120f1 100644 --- a/tests/test_analysis.cpp +++ b/tests/test_analysis.cpp @@ -11,7 +11,7 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK +//#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_control.cpp b/tests/test_control.cpp index 8a3f309..32b3f5f 100644 --- a/tests/test_control.cpp +++ b/tests/test_control.cpp @@ -17,8 +17,6 @@ nodes and links from a project. Deletion can be conditional on node or link appearing in any simple or rule-based controls. */ - -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_demand.cpp b/tests/test_demand.cpp index 5ad8272..3a7d38f 100644 --- a/tests/test_demand.cpp +++ b/tests/test_demand.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_hydraulics.cpp b/tests/test_hydraulics.cpp index 0da7e50..8fe81a0 100644 --- a/tests/test_hydraulics.cpp +++ b/tests/test_hydraulics.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include diff --git a/tests/test_link.cpp b/tests/test_link.cpp index aaa5b4e..0b9a25a 100644 --- a/tests/test_link.cpp +++ b/tests/test_link.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_net_builder.cpp b/tests/test_net_builder.cpp index daaa2b6..5c6f274 100644 --- a/tests/test_net_builder.cpp +++ b/tests/test_net_builder.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_node.cpp b/tests/test_node.cpp index a15793b..68376fd 100644 --- a/tests/test_node.cpp +++ b/tests/test_node.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_pattern.cpp b/tests/test_pattern.cpp index b3b6542..a13cab6 100644 --- a/tests/test_pattern.cpp +++ b/tests/test_pattern.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_project.cpp b/tests/test_project.cpp index 351f695..6f0b68c 100644 --- a/tests/test_project.cpp +++ b/tests/test_project.cpp @@ -11,8 +11,6 @@ ****************************************************************************** */ - -#define BOOST_ALL_DYN_LINK #include #include diff --git a/tests/test_quality.cpp b/tests/test_quality.cpp index e2eeaef..973732a 100644 --- a/tests/test_quality.cpp +++ b/tests/test_quality.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_reent.cpp b/tests/test_reent.cpp index f296117..14cf154 100644 --- a/tests/test_reent.cpp +++ b/tests/test_reent.cpp @@ -11,13 +11,12 @@ ****************************************************************************** */ +#include + #include #include #include -#define BOOST_ALL_DYN_LINK -#include - #include "epanet2_2.h" #define NUM_THREADS 2 diff --git a/tests/test_report.cpp b/tests/test_report.cpp index 8f9e82c..f1268a3 100644 --- a/tests/test_report.cpp +++ b/tests/test_report.cpp @@ -11,7 +11,6 @@ ****************************************************************************** */ -#define BOOST_ALL_DYN_LINK #include #include "test_toolkit.hpp" diff --git a/tests/test_toolkit.cpp b/tests/test_toolkit.cpp index 8c4b191..33945c8 100644 --- a/tests/test_toolkit.cpp +++ b/tests/test_toolkit.cpp @@ -11,9 +11,7 @@ ****************************************************************************** */ - #define BOOST_TEST_MODULE toolkit -#define BOOST_ALL_DYN_LINK #include diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt index df2f743..2c380ff 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -1,10 +1,20 @@ -cmake_minimum_required(VERSION 3.12) enable_testing() -set (Boost_USE_STATIC_LIBS OFF) +# Sets for output directory for executables and libraries +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + + +IF(MSVC) + set (Boost_USE_STATIC_LIBS OFF) + add_definitions(-DBOOST_ALL_DYN_LINK) +ENDIF(MSVC) + + find_package(Boost COMPONENTS unit_test_framework) include_directories (${Boost_INCLUDE_DIRS} ../../src/) @@ -16,3 +26,6 @@ set (test_source add_executable(test_errormanager ${test_source}) target_link_libraries(test_errormanager ${Boost_LIBRARIES}) + +add_test(NAME test_errormanager + COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_errormanager) diff --git a/tests/util/test_errormanager.cpp b/tests/util/test_errormanager.cpp index 7d270ae..0003ee2 100644 --- a/tests/util/test_errormanager.cpp +++ b/tests/util/test_errormanager.cpp @@ -1,7 +1,7 @@ #define BOOST_TEST_MODULE errormanager -#define BOOST_TEST_DYN_LINK +//#define BOOST_TEST_DYN_LINK #include #include "util/errormanager.h" @@ -37,19 +37,19 @@ BOOST_AUTO_TEST_SUITE(test_errormanager) BOOST_AUTO_TEST_CASE (test_create_destroy) { error_handle_t *error_handle = NULL; - error_handle = error_new_manager(&mock_lookup); + error_handle = create_error_manager(&mock_lookup); - error_dst_manager(error_handle); + delete_error_manager(error_handle); } struct Fixture{ Fixture() { error_message = NULL; - error_handle = error_new_manager(&mock_lookup); + error_handle = create_error_manager(&mock_lookup); } ~Fixture() { - error_dst_manager(error_handle); + delete_error_manager(error_handle); free(error_message); } int error; @@ -60,21 +60,21 @@ struct Fixture{ BOOST_FIXTURE_TEST_CASE (test_set_clear, Fixture) { - error = error_set(error_handle, 100); + error = set_error(error_handle, 100); BOOST_CHECK(error == 100); - error_clear(error_handle); - error = error_check(error_handle, &error_message); + clear_error(error_handle); + error = check_error(error_handle, &error_message); BOOST_CHECK(error == 0); BOOST_CHECK(error_message == NULL); } BOOST_FIXTURE_TEST_CASE(test_set_check, Fixture) { - error = error_set(error_handle, 100); + error = set_error(error_handle, 100); BOOST_CHECK(error == 100); - error = error_check(error_handle, &error_message); + error = check_error(error_handle, &error_message); BOOST_CHECK(check_string(error_message, MESSAGE_STRING)); }