jjb: remove sid-powerpc from portbuild jobs

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

diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 390a7e9cd74ebbaa52b8266e9490a7d2fd9cfa97..c8f0c73fc9e461fe521eacdd0705b2f4f82aa1a9 100755 (executable)
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -98,13 +98,15 @@ SRCDIR="$WORKSPACE/src/liburcu"
 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/products.d/SLES.prod || -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
@@ -316,6 +318,9 @@ if [ "$USERSPACE_RCU_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 0.11 did not produce TAP logs
     if verlt "$PACKAGE_VERSION" "0.11"; then
         mkdir -p "$WORKSPACE/tap/no-log"