From 2bf3be4c64ba98d3d2f437d7f6f78a0598f05de3 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 22 Mar 2019 11:51:08 -0400
Subject: [PATCH] Adding tests at test root

Couldn't get tests in subdirectores to work so adding them at test root instead.
---
 .travis.yml                  | 2 +-
 CMakeLists.txt               | 9 ++++-----
 appveyor.yml                 | 2 +-
 tests/CMakeLists.txt         | 9 +++++++++
 tests/outfile/CMakeLists.txt | 4 ----
 tests/util/CMakeLists.txt    | 3 ---
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ab4945..b12e143 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
   - cmake --build .
   # run unit tests
   - cd tests
-  - ctest test
+  - ctest --output-on-failure
   # run regression tests
   - cd $EPANET_HOME
   - pip install -r tools/requirements.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dc6fd9..93fbda1 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,12 +28,11 @@
 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 tests (requires Boost)" OFF)
 option(BUILD_PY_LIB "Build library for Python wrapper" OFF)
 option(BUILD_COVERAGE "Build library for coverage" OFF)
 
@@ -43,8 +42,8 @@ IF (NOT BUILD_PY_LIB)
 ENDIF (NOT BUILD_PY_LIB)
 add_subdirectory(src/outfile)
 
-IF (BUILD_TESTING)
-    #Prep ourselves for compiling boost
+IF (BUILD_TESTS)
+    #Prep ourselves for compiling with boost
     IF(WIN32)
         set(Boost_USE_STATIC_LIBS       ON)
     ELSE(TRUE)
@@ -59,7 +58,7 @@ IF (BUILD_TESTING)
     add_subdirectory(tests)
     add_subdirectory(tests/outfile)
     add_subdirectory(tests/util)
-ENDIF (BUILD_TESTING)
+ENDIF (BUILD_TESTS)
 
 
 # Sets for output directory for executables and libraries.
diff --git a/appveyor.yml b/appveyor.yml
index 606f9c0..e234cd5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -70,7 +70,7 @@ before_test:
 test_script:
   # run unit tests
   - cd %BUILD_HOME%\tests
-  - ctest -C Release RUN_TESTS
+  - ctest -C Release --output-on-failure
   # run regression tests
   - cd %EPANET_HOME%
   - tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID%
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8028eef..7f3cd97 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -53,3 +53,12 @@ ENDIF(MSVC)
 add_test(NAME test_reent
     COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_reent
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
+
+
+# ctest doesn't like tests added in subdirectories so adding them here
+add_test(NAME test_errormanager
+    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_errormanager)
+
+add_test(NAME test_output
+    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_output
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data)
diff --git a/tests/outfile/CMakeLists.txt b/tests/outfile/CMakeLists.txt
index c9d7fc0..162a2ee 100644
--- a/tests/outfile/CMakeLists.txt
+++ b/tests/outfile/CMakeLists.txt
@@ -10,7 +10,3 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 add_executable(test_output test_output.cpp)
 target_include_directories(test_output PUBLIC ../../src/outfile/include)
 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/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 713f113..6173a07 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -15,6 +15,3 @@ set (test_source
 add_executable(test_errormanager ${test_source})
 target_include_directories(test_errormanager PUBLIC ../../src/)
 target_link_libraries(test_errormanager ${Boost_LIBRARIES})
-
-add_test(NAME test_errormanager
-    COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_errormanager)