Merge pull request #23 from frdeso/vm_test_timeout

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

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index ad695d24263f1bd1dee265225caa77fb2f2f86d8..756b4aba0faa318f14c7e645c45af4943f1d6c5d 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -85,6 +85,7 @@ rm -rf "$PREFIX" "$TAPDIR"
 mkdir -p "$PREFIX" "$TAPDIR"
 
 #export TMPDIR
+CFLAGS="-g -O2"
 
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
@@ -103,23 +104,25 @@ BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/"
 
 # Set platform variables
 case "$arch" in
-solaris10)
+sol10-i386)
     MAKE=gmake
     TAR=gtar
     NPROC=gnproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1"
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
+
+    export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
     ;;
 
-solaris11)
+sol11-i386)
     MAKE=gmake
     TAR=gtar
     NPROC=nproc
     BISON="/opt/csw/bin/bison"
     YACC="$BISON -y"
-    CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1"
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
     RUN_TESTS="no"
 
     export PATH="$PATH:/usr/perl5/bin"
@@ -134,17 +137,27 @@ macosx)
     RUN_TESTS="no"
 
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-    CFLAGS="-I/opt/local/include"
+    CFLAGS="$CFLAGS -I/opt/local/include"
     LDFLAGS="-L/opt/local/lib"
     ;;
 
+cygwin|cygwin64|msys32|msys64)
+    MAKE=make
+    TAR=tar
+    NPROC=nproc
+    BISON="bison"
+    YACC="$BISON -y"
+    #CFLAGS=""
+    RUN_TESTS="no"
+    ;;
+
 *)
     MAKE=make
     TAR=tar
     NPROC=nproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS=""
+    #CFLAGS=""
     RUN_TESTS="yes"
 
     PYTHON2=python2
@@ -227,6 +240,11 @@ relayd-only)
     CONF_OPTS="--disable-bin-lttng --disable-bin-lttng-consumerd --disable-bin-lttng-crash --disable-bin-lttng-sessiond --disable-extras --disable-man-pages $NO_UST"
     ;;
 
+debug-rcu)
+    echo "Enable RCU sanity checks for debugging"
+    CPPFLAGS="${CPPFLAGS:-} -DDEBUG_RCU"
+    ;;
+
 *)
     echo "Standard build"
     CONF_OPTS=""
@@ -329,7 +347,7 @@ if [ "$RUN_TESTS" = "yes" ]; then
     if [ "$conf" != "no-ust" ]; then
         # Run 'unit_tests', 2.8 and up has a new test suite
         if vergte "$PACKAGE_VERSION" "2.8"; then
-            make check
+            make --keep-going check
             rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*'" $BUILD_PATH/tests/" "$TAPDIR"
         else
             prove --merge -v --exec '' - < "$BUILD_PATH/tests/unit_tests" --archive "$TAPDIR/unit/" || true