From d5fc0fca41afa1743dd879999b603d3d01fef5b3 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 17 May 2020 08:19:42 -0400 Subject: [PATCH] Travis: Fix cron. --- .travis.yml | 12 +++++++++--- ci/test.sh | 12 +++++++++--- nodist/code_coverage | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f74b76eb..e9f57608b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,13 +113,19 @@ jobs: stage: "Build Verilator" name: "20.04 clang build+test" script: ci/test.sh all -# Cron coverage runs +# Cron coverage runs (two parts to avoid 50min timeout) - if: type = cron dist: focal compiler: gcc - stage: "Build Verilator" + stage: "Coverage Build Verilator" name: "Coverage" - script: ci/test.sh coverage + script: ci/test.sh coverage1 + - if: type = cron + dist: focal + compiler: gcc + stage: "Coverage Test Verilator" + name: "Coverage" + script: ci/test.sh coverage2 notifications: email: diff --git a/ci/test.sh b/ci/test.sh index d299d195c..1a18d5098 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -12,9 +12,8 @@ set -e export DRIVER_FLAGS='-j 0 --quiet --rerun' case $1 in - coverage) - nodist/code_coverage - bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info + all) + make -C test_regress ;; dist) make -C test_regress SCENARIOS=--dist @@ -31,6 +30,13 @@ case $1 in vltmt1) make -C test_regress SCENARIOS=--vltmt DRIVER_HASHSET=--hashset=1/2 ;; + coverage1) + nodist/code_coverage --stages 1-2 + ;; + coverage2) + nodist/code_coverage + bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info + ;; *) echo "Usage: test.sh (dist|vlt|vltmt)" exit -1 diff --git a/nodist/code_coverage b/nodist/code_coverage index 9762b5331..4a9a1dc43 100755 --- a/nodist/code_coverage +++ b/nodist/code_coverage @@ -91,7 +91,7 @@ sub test { if ($Opt_Stages{3}) { travis_fold_start("test"); - print "Stage 3: make examples (with coverage on)\n"; + print "Stage 3: make tests (with coverage on)\n"; run("make examples"); run("make test_regress" . ($Opt_Stop ? '' : ' || true'));