diff --git a/.travis.yml b/.travis.yml index 962be26d6..8333e3bf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -251,12 +251,24 @@ jobs: stage: test name: "Coverage vlt set 2" script: ci/test.sh coverage-vlt2 + - if: type = cron + dist: focal + compiler: gcc + stage: test + name: "Coverage vltmt set 2" + script: ci/test.sh coverage-vltmt2 - if: type = cron dist: focal compiler: gcc stage: test name: "Coverage vlt set 3" script: ci/test.sh coverage-vlt3 + - if: type = cron + dist: focal + compiler: gcc + stage: test + name: "Coverage vltmt set 3" + script: ci/test.sh coverage-vltmt3 notifications: email: diff --git a/ci/test.sh b/ci/test.sh index 6cb60308a..e5667a527 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -54,11 +54,19 @@ case $1 in bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info ;; coverage-vltmt0) - nodist/code_coverage --scenarios=--vltmt --hashset=0/2 + nodist/code_coverage --scenarios=--vltmt --hashset=0/4 bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info ;; coverage-vltmt1) - nodist/code_coverage --scenarios=--vltmt --hashset=1/2 + nodist/code_coverage --scenarios=--vltmt --hashset=1/4 + bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info + ;; + coverage-vltmt2) + nodist/code_coverage --scenarios=--vltmt --hashset=3/4 + bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info + ;; + coverage-vltmt3) + nodist/code_coverage --scenarios=--vltmt --hashset=4/4 bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info ;; *) diff --git a/nodist/code_coverage b/nodist/code_coverage index d37541775..b7efc0528 100755 --- a/nodist/code_coverage +++ b/nodist/code_coverage @@ -190,7 +190,8 @@ sub test { foreach my $dir (sort keys %dirs) { (my $outname = $dir) =~ s![^a-zA-Z0-9]+!_!g; $Fork->schedule(run_on_start => sub { - run("cd $cc_dir/info ; lcov -c -d ../../../../$dir --exclude /usr -o app_test_${outname}.info"); + # .info may be empty, so ignore errors (unfortunately) + run("cd $cc_dir/info ; lcov -c -d ../../../../$dir --exclude /usr -o app_test_${outname}.info || true"); })->run; } $Fork->wait_all;