diff options
| author |  lberki <lberki@google.com> | 2017-06-09 10:31:39 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-06-09 10:57:34 -0400 |
| commit | 913478d20b3139311f27469c23a63abec67f2d55 (patch) | |
| tree | c5fc09b8355eb1b810a5a14fb8ff95e2f4f349b0 /tools/test | |
| parent | cda9b9c31933b8c29beec6fe5fa1ed0270859d0b (diff) | |
Use the correct JVM for LcovMerger instead of whatever "java" gets us.
Fixes #2904.
RELNOTES: None.
PiperOrigin-RevId: 158516169
Diffstat (limited to 'tools/test')
| -rwxr-xr-x | tools/test/collect_coverage.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/test/collect_coverage.sh b/tools/test/collect_coverage.sh index b8e1dc7ddb..559c60d60f 100755 --- a/tools/test/collect_coverage.sh +++ b/tools/test/collect_coverage.sh @@ -136,7 +136,7 @@ if [[ "$COVERAGE_LEGACY_MODE" ]]; then exit $TEST_STATUS fi -export LCOV_MERGER_CMD="java -jar ${LCOV_MERGER} --coverage_dir=${COVERAGE_DIR} \ +export LCOV_MERGER_CMD="${LCOV_MERGER} --coverage_dir=${COVERAGE_DIR} \ --output_file=${COVERAGE_OUTPUT_FILE}" @@ -146,4 +146,7 @@ if [[ $DISPLAY_LCOV_CMD ]] ; then echo "-----------------" fi -exec $LCOV_MERGER_CMD +# JAVA_RUNFILES is set to the runfiles of the test, which does not necessarily +# contain a JVM (it does only if the test has a Java binary somewhere). So let +# the LCOV merger discover where its own runfiles tree is. +JAVA_RUNFILES= exec $LCOV_MERGER_CMD |