Skip to content

Commit

Permalink
Revert "Travis: use --concurrency=multiprocessing only on build tests (
Browse files Browse the repository at this point in the history
…spack#6872)"

This reverts commit 596d463.
  • Loading branch information
alalazo committed Jan 18, 2018
1 parent 4dd6ee2 commit 1faff66
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# .coveragerc to control coverage.py
[run]
parallel = True
concurrency = multiprocessing
branch = True
source = lib
omit =
Expand Down
6 changes: 1 addition & 5 deletions share/spack/qa/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@ 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=""
Expand Down

0 comments on commit 1faff66

Please sign in to comment.