X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=efc8be1b99edf55497637c770eb1ddcd60f5308c;hb=ab123b17bb7169924cb6f3be8c1ef0a1c6133552;hp=c18423de4deac6d28df702719ce15448e925f748;hpb=1d56e325ac199eb068729afbb04b3e954cb23061;p=lttng-ci.git

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index c18423d..efc8be1 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -189,6 +189,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 +350,11 @@ esac
 # BUILD!
 $MAKE -j "$($NPROC)" V=1
 
+# Force rebase DLL address mapping
+if [ "${rebase_dll:-}" == "1" ]; then
+	find . -name "*.dll" | xargs rebase -O -v
+fi
+
 # Install in the workspace
 $MAKE install DESTDIR="$WORKSPACE"
 
@@ -351,6 +365,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