From c710184fba7b2eb1aa8063f082013b04dc7cd6f7 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 2 Feb 2018 09:46:16 -0600 Subject: [PATCH] Run tests from root directory --- .travis.yml | 2 +- tools/ci/travis-script.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a745c5d6..05e239025 100644 --- 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 index 468cd0cc8..ee445b517 100755 --- 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