jjb: archive top-level test suite log

[lttng-ci.git] / scripts / babeltrace / build.sh

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index ddb9162a4a351840444f33a551b2c9463eb1bcfa..6f2f0f76174e872aef508aa715f263291f300e7b 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -106,13 +106,15 @@ 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 ) && ( "$(uname -m)" == "x86_64" ) ]]; then
-    LIBDIR_ARCH="${LIBDIR}64"
-else
-    LIBDIR_ARCH="$LIBDIR"
+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
@@ -371,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"