Feature nrtest

.travis.yml

@@ -1,12 +1,25 @@
-language: c
+language: python
+
+env: 
+  global: 
+    - EPANET_HOME=`pwd`
+    - BUILD_HOME=build/CMake/buildproducts
+    - TEST_HOME=tests/epanet-nrtestsuite
+
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y swig 
+
+install:
+  - pip install -r requirements.txt
 
 before_script:
-  - cd build/CMake
-  - mkdir buildproducts
-  - cd buildproducts
+  - mkdir -p $BUILD_HOME
+  - cd $BUILD_HOME
   - cmake ..
 
 script:
   - make
-#  - cd ../../../tests
-#  - ./test_networks.sh
+  - cd $EPANET_HOME
+  - tools/gen-config.sh $EPANET_HOME/$BUILD_HOME/bin > $TEST_HOME/apps/epanet-$TRAVIS_COMMIT.json
+  - tools/run-nrtest.sh $TEST_HOME $TRAVIS_COMMIT

build/CMake/CMakeLists.txt

@@ -1,5 +1,36 @@
-## cmake .
-## make
+# CMakeLists.txt - CMake configuration file for EPANET 2.0 
+# 
+# CMake is a cross-platform build tool. CMake generates platform native 
+# makefiles that can be used with your compiler of choice. CMake uses a 
+# generator concept to represent different build tooling. CMake automatically 
+# detects the platform it is running on and generates the appropriate makefiles
+# for the platform default compiler. Different generators can also be specified. 
+# 
+# Note: CMake requires that your platform build system and compiler are 
+# properly installed. Build using Visual Studio requires msbuild shell.  
+#  
+# Example Usage: 
+#   cd build/cmake
+#   mkdir buildproducts
+#   cd buildproducts
+#   cmake ..
+#   make 
+#    
+# Building MSYS on Windows:
+#   ...
+#   cmake -G "MSYS Makefiles" ..
+#   make 
+# 
+# Building Visual Studio on Windows: 
+#   ...
+#   cmake -G "Visual Studio 10 2010" ..
+#   msbuild /p:Configuration=Release ALL_BUILD.vcxproj
+#
+# More information:
+#   cmake --help
+# 
+#   CMake is available at https://cmake.org/download/
+# 
 
 cmake_minimum_required (VERSION 2.6)
 
@@ -22,8 +53,3 @@ add_library(epanet STATIC  ${EPANET_SOURCES})
 include_directories(../../src)
 add_executable(runepanet ../../run/main.c)
 target_link_libraries (runepanet LINK_PUBLIC epanet m)
-
-# the binary hydraulics file API
-include_directories(../../tools/epanet-output/src)
-file(GLOB EN_OUTPUT_SOURCES ../../tools/epanet-output/src/*.c)
-add_library(ENBinaryOut SHARED ${EN_OUTPUT_SOURCES})

requirements.txt

@@ -0,0 +1,11 @@
+#
+# requirements.txt 
+#
+# Useful for configuring a python environment to run epanet-nrtestsuite. 
+#
+# command: pip install -r requirements.txt
+#
+
+-e ./tools/epanet-output
+-e ./tools/epanet-reader
+-e ./tools/nrtest-epanet

tests/.gitignore

@@ -0,0 +1,9 @@
+# Ignore app description files generated for nrtest
+apps/
+
+# Ignore results generated during nrtest execution
+benchmark/
+
+# Except changes to reference benchmark
+!benchmark/epanet-2012   # Results for EPANET 2.0.12 MSVC 2010 32-bit
+