diff options
| author | Paul Moore <paul@paul-moore.com> | 2021-08-04 01:07:52 -0400 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2021-08-12 12:38:20 -0400 |
| commit | 4ef8ff4ff33035245a3f477f251500c5024d9cdf (patch) | |
| tree | fad3cb13f5108ca1ea834bfbbcf86668ea0c992a | |
| parent | d716d75cf7e105028855ae39da568d60a6a9bf34 (diff) | |
| download | libseccomp-4ef8ff4ff33035245a3f477f251500c5024d9cdf.tar.gz | |
github: tweak the GH Actions configuration
This should help leverage the recent code coverage changes as well as
some changes to the test framework. We also add the generated HTML
coverage report to the "codecoverage" artifacts.
Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
(imported from commit c261232174c8432e12c39e2fc938a64d562de1d6)
| -rw-r--r-- | .github/workflows/continuous-integration.yml | 20 | ||||
| -rw-r--r-- | Makefile.am | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b253a91..5dcc5e9 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -37,7 +37,9 @@ jobs: ./configure --enable-python make check-build - name: Run tests - run: LIBSECCOMP_TSTCFG_STRESSCNT=5 make check + run: | + LIBSECCOMP_TSTCFG_JOBS=0 \ + LIBSECCOMP_TSTCFG_STRESSCNT=5 make check livetests: name: Live Tests @@ -53,7 +55,10 @@ jobs: ./configure --enable-python make check-build - name: Run live tests - run: LIBSECCOMP_TSTCFG_TYPE=live LIBSECCOMP_TSTCFG_MODE_LIST=c make -C tests check + run: | + LIBSECCOMP_TSTCFG_JOBS=0 \ + LIBSECCOMP_TSTCFG_TYPE=live \ + LIBSECCOMP_TSTCFG_MODE_LIST=c make -C tests check scanbuild: name: Scan Build @@ -83,18 +88,19 @@ jobs: ./configure --enable-code-coverage - name: Run tests with code coverage enabled run: | - make test-code-coverage - - name: Gather code coverage results - run: lcov -c --exclude tests --exclude tools --exclude src/arch-syscall-check.c -d . -o lcov.info + LIBSECCOMP_TSTCFG_JOBS=0 \ + make test-code-coverage - name: Upload code coverage results uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ./lcov.info + path-to-lcov: ./libseccomp.lcov.info flag-name: "amd64" - name: Archive code coverage results if: ${{ always() }} uses: actions/upload-artifact@v2 with: name: Code Coverage Artifacts - path: lcov.* + path: | + ./libseccomp.lcov.info + ./libseccomp.lcov.html.d diff --git a/Makefile.am b/Makefile.am index b7d491f..588e023 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,8 +18,10 @@ @CODE_COVERAGE_RULES@ +CODE_COVERAGE_OUTPUT_FILE = libseccomp.lcov.info +CODE_COVERAGE_OUTPUT_DIRECTORY = libseccomp.lcov.html.d CODE_COVERAGE_IGNORE_PATTERN = \ - /usr/include/bits/* \ + */usr/include/* \ */src/arch-syscall-check.c \ */src/syscalls.perf |