From 90e0c9bdcd625636cc57c470af657b343cc5e06e Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 8 Dec 2020 08:00:24 -0500
Subject: [PATCH] CI: internal coverage updates

---
 .github/workflows/coverage.yml | 44 ++--------------------------------
 ci/ci-script.bash              |  3 +++
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 97fba4c18..d262b7e6c 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -54,48 +54,8 @@ jobs:
           CI_BUILD_STAGE_NAME: test
         run: bash ci/ci-install.bash
 
-      - name: Test coverage-dist
+      - name: Test coverage-all
         env:
           CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-dist
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vlt-0
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vlt-0
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vlt-1
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vlt-1
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vlt-2
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vlt-2
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vlt-3
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vlt-3
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vltmt-0
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vltmt-0
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vltmt-1
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vltmt-1
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vltmt-2
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vltmt-2
-        run: bash ci/ci-script.bash
-      - name: Test coverage-vltmt-3
-        env:
-          CI_BUILD_STAGE_NAME: test
-          TESTS: coverage-vltmt-3
+          TESTS: coverage-all
         run: bash ci/ci-script.bash
diff --git a/ci/ci-script.bash b/ci/ci-script.bash
index 5c12aeef6..0c0d2a9b6 100755
--- a/ci/ci-script.bash
+++ b/ci/ci-script.bash
@@ -91,6 +91,9 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
     vltmt-1)
       "$MAKE" -C test_regress SCENARIOS=--vltmt DRIVER_HASHSET=--hashset=1/2
       ;;
+    coverage-all)
+      nodist/code_coverage --stages 3-
+      ;;
     coverage-dist)
       nodist/code_coverage --stages 3- --scenarios=--dist
       ;;