diff options
author | vkargov <kargov@gmail.com> | 2017-10-03 01:16:39 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-10-03 01:16:39 +0300 |
commit | 02a9ceaebbefdb2435b5758bc0f3cd1f5abc9d5b (patch) | |
tree | 65a280ab6a14fafe4ddc58a8c583c23623c4184f /scripts/ci/collect-coverage.sh | |
parent | edbc5c2334e10836479d1cc528c68d4ad5b47440 (diff) |
[ci] Small improvements for run-jenkins and collect-coverage. (#5669)
* [ci] Allow setting custom mono flags for test runs via MONO_TEST_FLAGS.
* [ci] Make the handling of CFLAGS a bit more flexible in run-jenkins.sh.
* [ci] Generalize collect-coverage to handle more targets.
Diffstat (limited to 'scripts/ci/collect-coverage.sh')
-rwxr-xr-x | scripts/ci/collect-coverage.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/ci/collect-coverage.sh b/scripts/ci/collect-coverage.sh index f600c3ace39..6fdb428d7dd 100755 --- a/scripts/ci/collect-coverage.sh +++ b/scripts/ci/collect-coverage.sh @@ -3,10 +3,11 @@ # This script is meant to be executed on all "slave" machines that run coverage collection. COV_DIR=coverage -COV_INFO="$COV_DIR/$JOB_NAME.info" +COV_NAME="$(echo $JOB_NAME | sed 's#/#-#g').info" +COV_INFO="$COV_DIR/$COV_NAME" # Build Mono and collect coverage on the test suite. -CI_TAGS=collect-coverage,monolite scripts/ci/run-jenkins.sh +CI_TAGS="collect-coverage,monolite,$CI_TAGS" scripts/ci/run-jenkins.sh # Place the coverage info file into the coverage directory. # Multiple such files can be assembled to create a unified coverage report that spans multiple architectures and operating systems. @@ -14,7 +15,7 @@ mkdir "$COV_DIR" scripts/ci/run-step.sh --label=coverage-lcov --timeout=20m lcov --no-external -c -d mono -d support -d tools -o "$COV_INFO" # Generate HTML coverage report in the lcov directory at the root of the project. -scripts/ci/run-step.sh --label=coverage-genhtml --timeout=20m genhtml "$COV_INFO" -o lcov +scripts/ci/run-step.sh --label=coverage-genhtml --timeout=20m genhtml -f -s "$COV_INFO" -o lcov # Make the paths relative so that they could be assembled from different Jenkins workspaces. sed -Eie "s#^SF:$WORKSPACE/?#SF:#" "$COV_INFO" |