Revert "LAVA: use verbose mode for vlttng"

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

diff --git a/scripts/liburcu/build.sh b/scripts/liburcu/build.sh
index 796f4aa02a4a2ac91a213d1ed0b9da3bdd9f669f..7afb07f6e4e0d09587759b0ad592ae091fdf58e8 100755 (executable)
--- a/scripts/liburcu/build.sh
+++ b/scripts/liburcu/build.sh
@@ -84,44 +84,58 @@ rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
 
 export TMPDIR
+export CFLAGS="-g -O2"
 
 # Set platform variables
 case "$arch" in
-solaris10)
-    MAKE=gmake
-    TAR=gtar
-    NPROC=gnproc
-    CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1"
+sol10-i386)
+    export MAKE=gmake
+    export TAR=gtar
+    export NPROC=gnproc
+    export BISON=bison
+    export YACC="$BISON -y"
+    export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
+    export CPPFLAGS="-I/opt/csw/include"
+    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
+    export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
     ;;
-
-solaris11)
-    MAKE=gmake
-    TAR=gtar
-    NPROC=nproc
-    CFLAGS="-D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1"
+sol11-i386)
+    export MAKE=gmake
+    export TAR=gtar
+    export NPROC=nproc
     export PATH="$PATH:/usr/perl5/bin"
+    #export LD_ALTEXEC=/usr/sfw/bin/gld
+    #export LD=/usr/sfw/bin/gld
     ;;
-
 macosx)
-    MAKE=make
-    TAR=tar
-    NPROC="getconf _NPROCESSORS_ONLN"
-    BISON="bison"
-    YACC="$BISON -y"
-    export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-    export CFLAGS="-I/opt/local/include"
+    export MAKE=make
+    export TAR=tar
+    export NPROC="getconf _NPROCESSORS_ONLN"
+    export BISON="bison"
+    export YACC="$BISON -y"
     export LDFLAGS="-L/opt/local/lib"
+    export CFLAGS="$CFLAGS -I/opt/local/include"
+    export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     ;;
 
 *)
-    MAKE=make
-    TAR=tar
-    NPROC=nproc
-    CFLAGS=""
+    export MAKE=make
+    export TAR=tar
+    export NPROC=nproc
     ;;
 esac
 
-# Set configure options for each build configuration
+# Enter the source directory
+cd "$SRCDIR"
+
+# Run bootstrap in the source directory prior to configure
+./bootstrap
+
+# Get source version from configure script
+eval "$(grep '^PACKAGE_VERSION=' ./configure)"
+
+# Set configure options and environment variables for each build
+# configuration.
 CONF_OPTS=""
 case "$conf" in
 static)
@@ -134,23 +148,26 @@ tls_fallback)
     CONF_OPTS="--disable-compiler-tls"
     ;;
 
+debug-rcu)
+    echo "Enable RCU sanity checks for debugging"
+    if vergte "$PACKAGE_VERSION" "0.10"; then
+       CONF_OPTS="--enable-rcu-debug"
+    else
+       export CFLAGS="$CFLAGS -DDEBUG_RCU"
+    fi
+
+    echo "Enable iterator sanity validator"
+    if vergte "$PACKAGE_VERSION" "0.11"; then
+       CONF_OPTS+=" --enable-cds-lfht-iter-debug"
+    fi
+    ;;
+
 *)
     echo "Standard build"
     CONF_OPTS=""
     ;;
 esac
 
-
-# Enter the source directory
-cd "$SRCDIR"
-
-# Run bootstrap in the source directory prior to configure
-./bootstrap
-
-# Get source version from configure script
-eval "$(grep '^PACKAGE_VERSION=' ./configure)"
-
-
 # Build type
 # oot : out-of-tree build
 # dist: build via make dist
@@ -165,7 +182,7 @@ oot)
     BUILD_PATH=$WORKSPACE/oot
     mkdir -p "$BUILD_PATH"
     cd "$BUILD_PATH"
-    MAKE=$MAKE CFLAGS="$CFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+    "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 dist)
@@ -173,7 +190,7 @@ dist)
     BUILD_PATH=$(mktemp -d)
 
     # Initial configure and generate tarball
-    MAKE=$MAKE "$SRCDIR/configure"
+    "$SRCDIR/configure"
     $MAKE dist
 
     mkdir -p "$BUILD_PATH"
@@ -183,11 +200,11 @@ dist)
     # Ignore level 1 of tar
     $TAR xvf ./*.tar.* --strip 1
 
-    MAKE=$MAKE CFLAGS="$CFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 *)
     echo "Standard in-tree build"
-    MAKE=$MAKE CFLAGS="$CFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 esac
 
@@ -196,7 +213,7 @@ $MAKE -j "$($NPROC)" V=1
 $MAKE install
 
 # Run tests
-$MAKE check
+$MAKE --keep-going check
 # Only run regtest for 0.9 and up
 if vergte "$PACKAGE_VERSION" "0.9"; then
    $MAKE regtest