jjb: babeltrace: Release jobs script cleanup

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

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index c18423de4deac6d28df702719ce15448e925f748..b81adec457b88bdb54a4abf276838f07a810212e 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -169,13 +169,12 @@ sol11-i386)
     export MAKE=gmake
     export TAR=gtar
     export NPROC=nproc
-    export PATH="$PATH:/usr/perl5/bin"
-    export CPPFLAGS="-I/opt/csw/include"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
+    export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin"
     export LD_ALTEXEC=/usr/bin/gld
     export LD=/usr/bin/gld
     export PYTHON="python3"
     export PYTHON_CONFIG="python3-config"
+    export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
     ;;
 
 macosx)
@@ -189,6 +188,15 @@ macosx)
     export PYTHON_CONFIG="python3-config"
     ;;
 
+cygwin)
+    export MAKE=make
+    export TAR=tar
+    export NPROC=nproc
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
+    rebase_dll=1
+    ;;
+
 *)
     export MAKE=make
     export TAR=tar
@@ -341,6 +349,11 @@ esac
 # BUILD!
 $MAKE -j "$($NPROC)" V=1
 
+# Force rebase DLL address mapping
+if [ "${rebase_dll:-}" == "1" ]; then
+       find . -name "*.dll" -print0 | xargs -0 rebase -O -v
+fi
+
 # Install in the workspace
 $MAKE install DESTDIR="$WORKSPACE"
 
@@ -351,6 +364,13 @@ $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
+
 # Clean the build directory
 $MAKE clean