diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-01-20 16:10:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 16:10:25 +0100 |
| commit | 621388e5ae3e221a38372bbcf0e799b914f6dd27 (patch) | |
| tree | f287867406499f4ff3ff89d56ea1ad7dfa695554 | |
| parent | cf736ae9116314f01ab1ba9ca49bd6268fb28f61 (diff) | |
| download | spack-621388e5ae3e221a38372bbcf0e799b914f6dd27.tar.gz spack-621388e5ae3e221a38372bbcf0e799b914f6dd27.tar.bz2 spack-621388e5ae3e221a38372bbcf0e799b914f6dd27.tar.xz spack-621388e5ae3e221a38372bbcf0e799b914f6dd27.zip | |
Restore multiprocessing in unit tests (#6949)
* Revert "Travis: use --concurrency=multiprocessing only on build tests (#6872)"
This reverts commit 596d463714d46929f81db62b171c5a772679bb12.
* Removing 'coverage combine' in test script
According to what was discovered in #6887, one of the problems is
calling 'coverage combine' twice without the '-a' flag. This removes
the first call within our test scripts.
| -rw-r--r-- | .coveragerc | 1 | ||||
| -rwxr-xr-x | share/spack/qa/run-build-tests | 1 | ||||
| -rwxr-xr-x | share/spack/qa/run-unit-tests | 1 | ||||
| -rwxr-xr-x | share/spack/qa/setup.sh | 8 |
4 files changed, 2 insertions, 9 deletions
diff --git a/.coveragerc b/.coveragerc index 224c472fa2..0201a4b502 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,6 +2,7 @@ # .coveragerc to control coverage.py [run] parallel = True +concurrency = multiprocessing branch = True source = lib omit = diff --git a/share/spack/qa/run-build-tests b/share/spack/qa/run-build-tests index 7539a91313..56aa51542e 100755 --- a/share/spack/qa/run-build-tests +++ b/share/spack/qa/run-build-tests @@ -26,4 +26,3 @@ spack config get compilers # Run some build smoke tests, potentially with code coverage ${coverage_run} bin/spack install ${SPEC} -${coverage_combine} diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 87203ba915..74f92c19c5 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -29,4 +29,3 @@ ${coverage_run} bin/spack -p --lines 20 spec mpileaks # Run unit tests with code coverage ${coverage_run} bin/spack test "$@" -${coverage_combine} diff --git a/share/spack/qa/setup.sh b/share/spack/qa/setup.sh index 4b3f98e330..031554a035 100755 --- a/share/spack/qa/setup.sh +++ b/share/spack/qa/setup.sh @@ -11,18 +11,12 @@ SPACK_ROOT="$QA_DIR/../../.." . "$SPACK_ROOT/share/spack/setup-env.sh" # Set up some variables for running coverage tests. -if [[ "$COVERAGE" == "true" && "$TEST_SUITE" == "unit" ]]; then +if [[ "$COVERAGE" == true ]]; then coverage=coverage coverage_run="coverage run" - coverage_combine="coverage combine" -elif [[ "$COVERAGE" == "true" && "$TEST_SUITE" == "build" ]]; then - coverage=coverage - coverage_run="coverage run --concurrency=multiprocessing" - coverage_combine="coverage combine" else coverage="" coverage_run="" - coverage_combine="" fi # |