X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=3b0eb9d6485a250aa8c4949be33a840eed0e1108;hb=47ca4354b62b8a958f32086a066965aa23342357;hp=1f64168c6018bb84745e4268e75980965a1b613a;hpb=85322e5d1bd2d93741cb51c0e26728a71f0e3a01;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 1f64168..3b0eb9d 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -115,15 +115,14 @@ SRCDIR="$WORKSPACE/src/lttng-tools"
 TAPDIR="$WORKSPACE/tap"
 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
+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"
-    else
-        LIBDIR_ARCH="$LIBDIR"
     fi
 fi
 
@@ -497,7 +496,12 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
         fi
 
         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/ "$TAPDIR"
+
+        # Copy the test suites top-level log which includes all tests failures
+        rsync -a --include 'test-suite.log' --include '*/' --exclude='*' tests/ "$WORKSPACE/log"
     else
         cd tests
         mkdir -p "$TAPDIR/unit"