JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Cleaning up unit test build and test header

Browse Source
This commit is contained in:
Michael Tryby
2018-08-31 08:24:23 -04:00
parent 25db9cfe8f
commit dcf556ef0d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CMakeLists.txt
View File

@@ -26,7 +26,6 @@ endif(UNIX)
if(MSVC) if(MSVC)
set(Boost_DEBUG OFF) set(Boost_DEBUG OFF)
set(Boost_DETAILED_FAILURE_MSG OFF) set(Boost_DETAILED_FAILURE_MSG OFF)
set(Boost_THREADAPI win32)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
endif(MSVC) endif(MSVC)
set(Boost_THREAD_FOUND OFF) set(Boost_THREAD_FOUND OFF)
@@ -42,7 +41,6 @@ file(GLOB TEST_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test_*.cpp)
MESSAGE( STATUS "Thread found: " ${Boost_THREAD_FOUND}) MESSAGE( STATUS "Thread found: " ${Boost_THREAD_FOUND})
if(NOT ${Boost_THREAD_FOUND}) if(NOT ${Boost_THREAD_FOUND})
list(REMOVE_ITEM TEST_SRCS test_reent.cpp) list(REMOVE_ITEM TEST_SRCS test_reent.cpp)
MESSAGE("${TEST_SRCS}")
endif() endif()

2
tests/test_reent.cpp
View File

@@ -5,7 +5,7 @@
* Author: Michael E. Tryby * Author: Michael E. Tryby
* US EPA - ORD/NRMRL * US EPA - ORD/NRMRL
* *
* Unit testing for EPANET Output API. * Multi-threading / reentrancy test for EPANET Toolkit API.
*/ */
#include <string> #include <string>