From 649c39a62e81639fa00156a7b82f54917f7b068c Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 22 Jul 2019 12:08:10 -0400 Subject: [PATCH] jjb: babeltrace: fix tap for bt < 1.5 Signed-off-by: Michael Jeanson --- scripts/babeltrace/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index c18423d..910ce3a 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -351,6 +351,13 @@ $MAKE --keep-going check || failed_tests=1 # Copy tap logs for the jenkins tap parser before cleaning the build dir rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap" +# The test suite prior to 1.5 did not produce TAP logs +if verlt "$PACKAGE_VERSION" "1.5"; then + mkdir -p "$WORKSPACE/tap/no-log" + echo "1..1" > "$WORKSPACE/tap/no-log/tests.log" + echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log" +fi + # Clean the build directory $MAKE clean -- 2.34.1