From 952224324e1ee6bf9cda2c95b6e19254e8fa4f6c Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Wed, 12 Jul 2017 15:46:37 -0400 Subject: [PATCH] Run check_source separately from run_tests --- .travis.yml | 27 +++++++++++++++++++-------- tests/travis.sh | 7 ------- 2 files changed, 19 insertions(+), 15 deletions(-) delete mode 100755 tests/travis.sh diff --git a/.travis.yml b/.travis.yml index ece6c3fc6f..099bba55aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,13 @@ cache: directories: - $HOME/nndc_hdf5 env: + - OPENMC_CONFIG="check_source" - OPENMC_CONFIG="^hdf5-debug$|^omp-hdf5-debug$" - OPENMC_CONFIG="^mpi-hdf5-debug$|^phdf5-debug$" +matrix: + exclude: + - python: "2.7" + env: OPENMC_CONFIG="check_source" before_install: # ============== Handle Python third-party packages ============== @@ -35,13 +40,15 @@ before_install: - source activate test-environment # Install GCC, HDF5, PHDF5 - - sudo add-apt-repository ppa:nschloe/hdf5-backports -y - - sudo apt-get update -q - - sudo apt-get install libhdf5-serial-dev libhdf5-mpich-dev -y - - export FC=gfortran - - export MPI_DIR=/usr - - export PHDF5_DIR=/usr - - export HDF5_DIR=/usr + - if [[ $OPENMC_CONFIG != "check_source" ]]; then + sudo add-apt-repository ppa:nschloe/hdf5-backports -y; + sudo apt-get update -q; + sudo apt-get install libhdf5-serial-dev libhdf5-mpich-dev -y; + export FC=gfortran; + export MPI_DIR=/usr; + export PHDF5_DIR=/usr; + export HDF5_DIR=/usr; + fi install: true @@ -58,5 +65,9 @@ before_script: script: - cd tests - export OMP_NUM_THREADS=2 - - ./travis.sh + - if [[ $OPENMC_CONFIG == "check_source" ]]; then + ./check_source.py; + else + ./run_tests.py -C $OPENMC_CONFIG -j 2; + fi - cd .. diff --git a/tests/travis.sh b/tests/travis.sh deleted file mode 100755 index f7cc3cd778..0000000000 --- a/tests/travis.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -ev - -# Run all debug tests -./check_source.py -./run_tests.py -C $OPENMC_CONFIG -j 2