From dcf556ef0d412bf0dc017382c49a1d6ff867dcc0 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 31 Aug 2018 08:24:23 -0400
Subject: [PATCH 1/4] Cleaning up unit test build and test header

---
 tests/CMakeLists.txt | 2 --
 tests/test_reent.cpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8b93c76..add4e31 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -26,7 +26,6 @@ endif(UNIX)
 if(MSVC)
     set(Boost_DEBUG                 OFF)
     set(Boost_DETAILED_FAILURE_MSG  OFF)
-    set(Boost_THREADAPI             win32)
     set(Boost_USE_STATIC_LIBS       ON)
 endif(MSVC)
 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})
 if(NOT ${Boost_THREAD_FOUND})
     list(REMOVE_ITEM TEST_SRCS test_reent.cpp)
-    MESSAGE("${TEST_SRCS}")
 endif()
 
 
diff --git a/tests/test_reent.cpp b/tests/test_reent.cpp
index 1117284..4ac1d3c 100644
--- a/tests/test_reent.cpp
+++ b/tests/test_reent.cpp
@@ -5,7 +5,7 @@
  *   Author: Michael E. Tryby
  *           US EPA - ORD/NRMRL
  *
- *   Unit testing for EPANET Output API.
+ *   Multi-threading / reentrancy test for EPANET Toolkit API.
 */
 
 #include <string>

From b6250e27ebed95f7cfccd23491bd2e04c70d980c Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 31 Aug 2018 08:41:42 -0400
Subject: [PATCH 2/4] Reverting change to Boost_THREADAPI

---
 tests/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index add4e31..50f8bf4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -26,6 +26,7 @@ endif(UNIX)
 if(MSVC)
     set(Boost_DEBUG                 OFF)
     set(Boost_DETAILED_FAILURE_MSG  OFF)
+    set(Boost_THREADAPI             win32)
     set(Boost_USE_STATIC_LIBS       ON)
 endif(MSVC)
 set(Boost_THREAD_FOUND              OFF)    

From 84eb3066816b5587c1fedbe6f411acac5f6a740f Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 31 Aug 2018 10:54:37 -0400
Subject: [PATCH 3/4] Shutting of regression testing.

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4dcd2fa..7dfa9f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ script:
   - cd tests
   - ctest
   # run regression tests
-  - cd $EPANET_HOME
-  - pip install -r tools/requirements.txt
-  - tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT
-  - tools/run-nrtest.sh $TEST_HOME $TRAVIS_COMMIT
+  #- cd $EPANET_HOME
+  #- pip install -r tools/requirements.txt
+  #- tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT
+  #- tools/run-nrtest.sh $TEST_HOME $TRAVIS_COMMIT

From b2aa8de927c03b42386970634b27a568d49096c1 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 31 Aug 2018 13:15:00 -0400
Subject: [PATCH 4/4] Fixing build error on Travis

---
 include/epanet2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/epanet2.h b/include/epanet2.h
index 6ac7733..f7ca1a9 100644
--- a/include/epanet2.h
+++ b/include/epanet2.h
@@ -1185,7 +1185,7 @@ extern "C" {
 
   //int DLLEXPORT EN_epanet(EN_ProjectHandle ph, const char *f1, const char *f2,
 	//  const char *f3, void(*pviewprog)(char *));
-  int DLLEXPORT EN_init(EN_ProjectHandle *ph, char *rptFile, char *binOutFile,
+  int DLLEXPORT EN_init(EN_ProjectHandle ph, char *rptFile, char *binOutFile,
           EN_FlowUnits UnitsType, EN_FormType HeadlossFormula);
 
   int DLLEXPORT EN_open(EN_ProjectHandle ph, const char *inpFile,