travis test3

solomonsg · Feb 15, 2017 · 511a610 · 511a610
1 parent 3a40013
commit 511a610
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 110 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ matrix:
   # Image Driver with rvic-routing
   - compiler: gcc
     os: linux
-    env: TESTID='rvic'
+    env: TESTID='image' EXTENSION='ROUT=rout_rvicerr'
     addons:
       apt_packages:
         - libnetcdf-dev

diff --git a/ci/image.travis b/ci/image.travis
@@ -61,7 +61,7 @@ function vic_install {
     echo vic_install
     cd ${TRAVIS_BUILD_DIR}
     echo $PWD
-    make full -C $DRIVER_PATH
+    make full $EXTENSION -C $DRIVER_PATH
 }
 
 function vic_before_script {

diff --git a/ci/rvic.travis b/ci/rvic.travis
diff --git a/tests/system/system_tests.cfg b/tests/system/system_tests.cfg
@@ -232,8 +232,8 @@ check = nonans
 
 [System-mpi_image_check_identical_results]
 test_description = check that multi-processor runs produce identical results - image driver
-driver = image,rvic
-global_parameter_file = global.image.STEHE.mpi.txt,global.image.STEHE.mpi.txt
+driver = image
+global_parameter_file = global.image.STEHE.mpi.txt
 expected_retval = 0
 check = mpi
 [[mpi]]
@@ -251,11 +251,3 @@ check = driver_match
 FULL_ENERGY=FALSE
 FROZEN_SOIL=FALSE
 
-#[System-check-rvic]
-#test_description = image driver with rvic routing enabled
-#driver = rvic
-#global_parameter_file = global.image.STEHE.rvic.txt
-##domain_file = image/Stehekin/parameters/domain.stehekin.20151028.nc
-#mpi_proc = 4
-#expected_retval = 0
-#check = nonans