X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=37a593abdeb7baeda770d3238018a4b46a6d7800;hb=9a07183cc9c8aa389f227c4455b8e33c3a386837;hp=2d39c2c0fee0af9b45b6af2da5f650e9bb6fa59e;hpb=0ef2148ab933b5d6f961c6afde35b21a13e8d0a6;p=lttng-ci.git diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index 2d39c2c..37a593a 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -88,6 +88,8 @@ conf=${conf:-} build=${build:-} cc=${cc:-} +# Controls if the tests are run +BABELTRACE_RUN_TESTS="${BABELTRACE_RUN_TESTS:=yes}" SRCDIR="$WORKSPACE/src/babeltrace" TMPDIR="$WORKSPACE/tmp" @@ -394,16 +396,18 @@ $MAKE install DESTDIR="$WORKSPACE" # Run tests, don't fail now, we want to run the archiving steps failed_tests=0 -$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" +if [ "$BABELTRACE_RUN_TESTS" = "yes" ]; then + $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 fi # Clean the build directory