X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=37a593abdeb7baeda770d3238018a4b46a6d7800;hb=e3c322027d1e4b20f057b8b604b3aed84d533e74;hp=8fe9fd8e4ded5dacf26f3fdaa91421a0e18ade81;hpb=894db5f110d0650f303b539b07866a238ba20228;p=lttng-ci.git

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 8fe9fd8..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"
@@ -188,15 +190,15 @@ sol11-i386)
     export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
-macosx)
+macos*)
     export MAKE=make
     export TAR=tar
     export NPROC="getconf _NPROCESSORS_ONLN"
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     export CPPFLAGS="-I/opt/local/include"
     export LDFLAGS="-L/opt/local/lib"
-    export PYTHON="python3"
-    export PYTHON_CONFIG="python3-config"
+    export PYTHON="python3.9"
+    export PYTHON_CONFIG="python3.9-config"
     ;;
 
 cygwin)
@@ -252,6 +254,13 @@ export BABELTRACE_MINIMAL_LOG_LEVEL=TRACE
 # Set configure options and environment variables for each build
 # configuration.
 CONF_OPTS=("--prefix=$PREFIX")
+
+# -Werror is enabled by default in stable-2.0 but won't be in 2.1
+# Explicitly disable it for consistency.
+if vergte "$PACKAGE_VERSION" "2.0"; then
+	CONF_OPTS+=("--disable-Werror")
+fi
+
 case "$conf" in
 static)
     echo "Static lib only configuration"
@@ -387,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