This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch acceptance-coverage in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit c32ad42dd155d42e40b3c3cf4be814de9afdc6f0 Author: Elek Márton <[email protected]> AuthorDate: Fri May 29 15:42:44 2020 +0200 fix jacoco test collection --- hadoop-ozone/dev-support/checks/acceptance.sh | 4 ++-- hadoop-ozone/dist/src/main/compose/test-all.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dev-support/checks/acceptance.sh b/hadoop-ozone/dev-support/checks/acceptance.sh index fc510f1..272d61f 100755 --- a/hadoop-ozone/dev-support/checks/acceptance.sh +++ b/hadoop-ozone/dev-support/checks/acceptance.sh @@ -34,7 +34,7 @@ cd "$DIST_DIR/compose" || exit 1 RES=$? cp result/* "$REPORT_DIR/" cp "$REPORT_DIR/log.html" "$REPORT_DIR/summary.html" - -"$DIST_DIR/share/jacoco/jacoco-cli.jar" merge $(find "$REPORT_DIR" -name "*.jacoco.exec") --destdir "$REPORT_DIR/jacoco-combined.exec" +set -x +java -jar "$DIST_DIR/share/jacoco/jacoco-cli.jar" merge $(find "$REPORT_DIR" -name "*.jacoco.exec") --destdir "$REPORT_DIR/jacoco-combined.exec" exit $RES diff --git a/hadoop-ozone/dist/src/main/compose/test-all.sh b/hadoop-ozone/dist/src/main/compose/test-all.sh index 3673bdd..a84abb2 100755 --- a/hadoop-ozone/dist/src/main/compose/test-all.sh +++ b/hadoop-ozone/dist/src/main/compose/test-all.sh @@ -41,7 +41,7 @@ for test in $(find "$SCRIPT_DIR" -name test.sh | sort); do echo "ERROR: Test execution of $(dirname "$test") is FAILED!!!!" fi RESULT_DIR="$(dirname "$test")/result" - cp "$RESULT_DIR"/robot-*.xml "$RESULT_DIR"/docker-*.log "$RESULT_DIR"/*.out* "$RESULT_DIR/*.exec" "$ALL_RESULT_DIR"/ + cp "$RESULT_DIR"/robot-*.xml "$RESULT_DIR"/docker-*.log "$RESULT_DIR"/*.out* "$RESULT_DIR"/*.exec "$ALL_RESULT_DIR"/ done rebot -N "smoketests" -d "$SCRIPT_DIR/result" "$SCRIPT_DIR/result/robot-*.xml" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
