Run tests from root directory

ChasingNeutrons · Feb 5, 2018 · c710184 · c710184
1 parent bc4c7d9
commit c710184
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,4 +41,4 @@ before_script:
 script:
   - ./tools/ci/travis-script.sh
 after_success:
-  - coveralls -d tests/.coverage
+  - coveralls
diff --git a/tools/ci/travis-script.sh b/tools/ci/travis-script.sh
@@ -2,14 +2,13 @@
 set -ex
 
 # Run source check
-cd tests
 if [[ $TRAVIS_PYTHON_VERSION == "3.4" && $OMP == 'n' && $MPI == 'n' ]]; then
-    ./check_source.py
+    pushd tests && python check_source.py && popd
 fi
 
 # Run regression and unit tests
 if [[ $MPI == 'y' ]]; then
-    pytest --cov=../openmc -v --mpi
+    pytest --cov=openmc -v --mpi tests
 else
-    pytest --cov=../openmc -v
+    pytest --cov=openmc -v tests
 fi