diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2021-08-19 23:03:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-19 14:03:10 -0700 |
| commit | 10695f1ed36bdaf6f813b261698e6a02b99d1f1c (patch) | |
| tree | 32f6d8dff6ce9495dacce73680207545888a4b0a /.github | |
| parent | 350372e3bf9c1ac5de2e7e74a3ccd8a46f7e1d5d (diff) | |
| download | spack-10695f1ed36bdaf6f813b261698e6a02b99d1f1c.tar.gz spack-10695f1ed36bdaf6f813b261698e6a02b99d1f1c.tar.bz2 spack-10695f1ed36bdaf6f813b261698e6a02b99d1f1c.tar.xz spack-10695f1ed36bdaf6f813b261698e6a02b99d1f1c.zip | |
Use kcov from official Ubuntu 20.04 repository (#25385)
* Ubuntu 20.04 provides kcov, so don't build from source
* Use two undocumented options for kcov v3.8
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/unit_tests.yaml | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index b45249f371..6436b6f6ad 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -131,10 +131,7 @@ jobs: # Needed for unit tests sudo apt-get -y install \ coreutils cvs gfortran graphviz gnupg2 mercurial ninja-build \ - patchelf - # Needed for kcov - sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev - sudo apt-get -y install zlib1g-dev libdw-dev libiberty-dev + patchelf cmake bison libbison-dev kcov - name: Install Python packages run: | pip install --upgrade pip six setuptools codecov coverage[toml] @@ -148,17 +145,6 @@ jobs: # Need this for the git tests to succeed. git --version . .github/workflows/setup_git.sh - - name: Install kcov for bash script coverage - if: ${{ needs.changes.outputs.with_coverage == 'true' }} - env: - KCOV_VERSION: 34 - run: | - KCOV_ROOT=$(mktemp -d) - wget --output-document=${KCOV_ROOT}/${KCOV_VERSION}.tar.gz https://github.com/SimonKagstrom/kcov/archive/v${KCOV_VERSION}.tar.gz - tar -C ${KCOV_ROOT} -xzvf ${KCOV_ROOT}/${KCOV_VERSION}.tar.gz - mkdir -p ${KCOV_ROOT}/build - cd ${KCOV_ROOT}/build && cmake -Wno-dev ${KCOV_ROOT}/kcov-${KCOV_VERSION} && cd - - make -C ${KCOV_ROOT}/build && sudo make -C ${KCOV_ROOT}/build install - name: Bootstrap clingo if: ${{ matrix.concretizer == 'clingo' }} env: @@ -204,10 +190,7 @@ jobs: run: | sudo apt-get -y update # Needed for shell tests - sudo apt-get install -y coreutils csh zsh tcsh fish dash bash - # Needed for kcov - sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev - sudo apt-get -y install zlib1g-dev libdw-dev libiberty-dev + sudo apt-get install -y coreutils kcov csh zsh tcsh fish dash bash - name: Install Python packages run: | pip install --upgrade pip six setuptools codecov coverage[toml] @@ -216,17 +199,6 @@ jobs: # Need this for the git tests to succeed. git --version . .github/workflows/setup_git.sh - - name: Install kcov for bash script coverage - if: ${{ needs.changes.outputs.with_coverage == 'true' }} - env: - KCOV_VERSION: 38 - run: | - KCOV_ROOT=$(mktemp -d) - wget --output-document=${KCOV_ROOT}/${KCOV_VERSION}.tar.gz https://github.com/SimonKagstrom/kcov/archive/v${KCOV_VERSION}.tar.gz - tar -C ${KCOV_ROOT} -xzvf ${KCOV_ROOT}/${KCOV_VERSION}.tar.gz - mkdir -p ${KCOV_ROOT}/build - cd ${KCOV_ROOT}/build && cmake -Wno-dev ${KCOV_ROOT}/kcov-${KCOV_VERSION} && cd - - make -C ${KCOV_ROOT}/build && sudo make -C ${KCOV_ROOT}/build install - name: Run shell tests (without coverage) if: ${{ needs.changes.outputs.with_coverage == 'false' }} run: | @@ -314,21 +286,7 @@ jobs: # Needed for unit tests sudo apt-get -y install \ coreutils cvs gfortran graphviz gnupg2 mercurial ninja-build \ - patchelf - # Needed for kcov - sudo apt-get -y install cmake binutils-dev libcurl4-openssl-dev - sudo apt-get -y install zlib1g-dev libdw-dev libiberty-dev - - name: Install kcov for bash script coverage - if: ${{ needs.changes.outputs.with_coverage == 'true' }} - env: - KCOV_VERSION: 34 - run: | - KCOV_ROOT=$(mktemp -d) - wget --output-document=${KCOV_ROOT}/${KCOV_VERSION}.tar.gz https://github.com/SimonKagstrom/kcov/archive/v${KCOV_VERSION}.tar.gz - tar -C ${KCOV_ROOT} -xzvf ${KCOV_ROOT}/${KCOV_VERSION}.tar.gz - mkdir -p ${KCOV_ROOT}/build - cd ${KCOV_ROOT}/build && cmake -Wno-dev ${KCOV_ROOT}/kcov-${KCOV_VERSION} && cd - - make -C ${KCOV_ROOT}/build && sudo make -C ${KCOV_ROOT}/build install + patchelf kcov - name: Install Python packages run: | pip install --upgrade pip six setuptools codecov coverage[toml] clingo |