X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=6f2f0f76174e872aef508aa715f263291f300e7b;hb=4174b905424b75e342b3bd0c68789ef021b61778;hp=df29e93e60c38b36627331af542276d680e3a8af;hpb=6946ebc05cf7251a905c1de6901f6208c37531cd;p=lttng-ci.git

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index df29e93..6f2f0f7 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -105,6 +105,17 @@ BABELTRACE_RUN_TESTS="${BABELTRACE_RUN_TESTS:=yes}"
 SRCDIR="$WORKSPACE/src/babeltrace"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="/build"
+LIBDIR="lib"
+LIBDIR_ARCH="$LIBDIR"
+
+# RHEL and SLES both use lib64 but don't bother shipping a default autoconf
+# site config that matches this.
+if [[ ( -f /etc/redhat-release || -f /etc/SuSE-release || -f /etc/yocto-release ) ]]; then
+    # Detect the userspace bitness in a distro agnostic way
+    if file -L /bin/bash | grep '64-bit' >/dev/null 2>&1; then
+        LIBDIR_ARCH="${LIBDIR}64"
+    fi
+fi
 
 # Create tmp directory
 rm -rf "$TMPDIR"
@@ -199,7 +210,7 @@ export BABELTRACE_MINIMAL_LOG_LEVEL=TRACE
 
 # Set configure options and environment variables for each build
 # configuration.
-CONF_OPTS=("--prefix=$PREFIX")
+CONF_OPTS=("--prefix=$PREFIX" "--libdir=$PREFIX/$LIBDIR_ARCH")
 
 # -Werror is enabled by default in stable-2.0 but won't be in 2.1
 # Explicitly disable it for consistency.
@@ -246,6 +257,14 @@ doc)
     CONF_OPTS+=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins" "--enable-api-doc")
     ;;
 
+asan)
+    echo "Address Sanitizer configuration"
+
+    # --enable-asan was introduced after 2.0 but don't check the version, we
+    # want this configuration to fail if ASAN is unavailable.
+    CONF_OPTS+=("--enable-asan" "--enable-python-bindings" "--enable-python-plugins")
+    ;;
+
 min)
     echo "Minimal configuration"
     ;;
@@ -258,6 +277,11 @@ min)
     if vergte "$PACKAGE_VERSION" "2.0"; then
         CONF_OPTS+=("--enable-python-bindings" "--enable-python-plugins")
     fi
+
+    # Something is broken in docbook-xml on yocto
+    if [[ "$platform" = yocto* ]]; then
+        CONF_OPTS+=("--disable-man-pages")
+    fi
     ;;
 esac
 
@@ -349,6 +373,9 @@ if [ "$BABELTRACE_RUN_TESTS" = "yes" ]; then
 	# 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"
 
+	# Copy the test suites top-level log which includes all tests failures
+	rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log"
+
 	# 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"
@@ -362,10 +389,10 @@ $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
 find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \;
-find "$WORKSPACE/$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
+find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.so" -exec chrpath --delete {} \;
 
 # Remove libtool .la files
-find "$WORKSPACE/$PREFIX/lib" -name "*.la" -exec rm -f {} \;
+find "$WORKSPACE/$PREFIX/$LIBDIR_ARCH" -name "*.la" -exec rm -f {} \;
 
 # Exit with failure if any of the tests failed
 exit $failed_tests