From b21b6e8331260246ec70fcd07cdb52875d2d6dfa Mon Sep 17 00:00:00 2001
From: Sterling Harper <smharper@mit.edu>
Date: Tue, 11 Jul 2017 11:32:29 -0400
Subject: [PATCH] Use Travis CI build matrix

---
 .travis.yml     | 3 +++
 tests/travis.sh | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fcefaa8f1..ece6c3fc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ addons:
 cache:
   directories:
   - $HOME/nndc_hdf5
+env:
+  - OPENMC_CONFIG="^hdf5-debug$|^omp-hdf5-debug$"
+  - OPENMC_CONFIG="^mpi-hdf5-debug$|^phdf5-debug$"
 
 before_install:
   # ============== Handle Python third-party packages ==============
diff --git a/tests/travis.sh b/tests/travis.sh
index 2dc352834..f7cc3cd77 100755
--- a/tests/travis.sh
+++ b/tests/travis.sh
@@ -4,8 +4,4 @@ set -ev
 
 # Run all debug tests
 ./check_source.py
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  ./run_tests.py -C "^hdf5-debug$|^omp-hdf5-debug|^mpi-hdf5-debug|^phdf5-debug$" -j 2
-else
-  ./run_tests.py -C "^hdf5-debug$" -j 2
-fi
+./run_tests.py -C $OPENMC_CONFIG -j 2