From 7e0bd152b72cf4990276943b168ffd2279770a91 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Fri, 3 Aug 2018 20:39:43 -0500
Subject: Generate coverage reports for all unit and build tests

---
 .travis.yml             | 26 +++++++++++++-------------
 share/spack/qa/setup.sh |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 73b258e540..d64a33174a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ jobs:
     - python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=unit, COVERAGE=true ]
+      env: TEST_SUITE=unit
     - python: '3.3'
       os: linux
       language: python
@@ -50,13 +50,13 @@ jobs:
     - python: '3.6'
       os: linux
       language: python
-      env: [ TEST_SUITE=unit, COVERAGE=true ]
+      env: TEST_SUITE=unit
     - python: '3.7'
       os: linux
       dist: xenial
       sudo: true
       language: python
-      env: [ TEST_SUITE=unit, COVERAGE=true ]
+      env: TEST_SUITE=unit
     - python: '3.6'
       os: linux
       language: python
@@ -64,48 +64,48 @@ jobs:
     - stage: 'unit tests - osx'
       os: osx
       language: generic
-      env: [ TEST_SUITE=unit, PYTHON_VERSION=2.7, COVERAGE=true ]
+      env: [ TEST_SUITE=unit, PYTHON_VERSION=2.7 ]
 # mpich (AutotoolsPackage)
     - stage: 'build tests'
       python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=mpich' ]
+      env: [ TEST_SUITE=build, 'SPEC=mpich' ]
 # astyle (MakefilePackage)
     - python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=astyle' ]
+      env: [ TEST_SUITE=build, 'SPEC=astyle' ]
 # tut (WafPackage)
     - python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=tut' ]
+      env: [ TEST_SUITE=build, 'SPEC=tut' ]
 # py-setuptools (PythonPackage)
     - python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=py-setuptools' ]
+      env: [ TEST_SUITE=build, 'SPEC=py-setuptools' ]
 # perl-dbi (PerlPackage)
 #    - python: '2.7'
 #      os: linux
 #      language: python
-#      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=perl-dbi' ]
+#      env: [ TEST_SUITE=build, 'SPEC=perl-dbi' ]
 # openjpeg (CMakePackage + external cmake)
     - python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=openjpeg' ]
+      env: [ TEST_SUITE=build, 'SPEC=openjpeg' ]
 # r-rcpp (RPackage + external R)
     - python: '2.7'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=r-rcpp' ]
+      env: [ TEST_SUITE=build, 'SPEC=r-rcpp' ]
 # mpich (AutotoolsPackage)
     - python: '3.6'
       os: linux
       language: python
-      env: [ TEST_SUITE=build, COVERAGE=true, 'SPEC=mpich' ]
+      env: [ TEST_SUITE=build, 'SPEC=mpich' ]
   allow_failures:
     - dist: xenial
 
@@ -179,7 +179,7 @@ before_script:
 #=============================================================================
 script:
   - share/spack/qa/run-$TEST_SUITE-tests
-  - if [[ "$COVERAGE" == "true" ]]; then codecov --env PYTHON_VERSION --required --flags "${TEST_SUITE}${TRAVIS_OS_NAME}"; fi
+  - if [[ "$TEST_SUITE" == "unit" || "$TEST_SUITE" == "build" ]]; then codecov --env PYTHON_VERSION --required --flags "${TEST_SUITE}${TRAVIS_OS_NAME}"; fi
 
 #=============================================================================
 # Notifications
diff --git a/share/spack/qa/setup.sh b/share/spack/qa/setup.sh
index 031554a035..029743f681 100755
--- a/share/spack/qa/setup.sh
+++ b/share/spack/qa/setup.sh
@@ -11,7 +11,7 @@ SPACK_ROOT="$QA_DIR/../../.."
 . "$SPACK_ROOT/share/spack/setup-env.sh"
 
 # Set up some variables for running coverage tests.
-if [[ "$COVERAGE" == true ]]; then
+if [[ "$TEST_SUITE" == "unit" || "$TEST_SUITE" == "build" ]]; then
     coverage=coverage
     coverage_run="coverage run"
 else
-- 
cgit v1.2.3-60-g2f50