X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=dded5f1efeda0b555474c8e6f92d3c6aa069103f;hb=aae4e17983454e0ecaafd78bc1cf9846a1bedf61;hp=b557c4143bee859b586163206d82c9965f015a9d;hpb=69a19833081b9bb6b1757666cafc553d68f44edc;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index b557c41..dded5f1 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -1,6 +1,6 @@
-#!/bin/bash -xue
+#!/bin/bash -exu
 #
-# Copyright (C) 2015 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2016 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 #                      Michael Jeanson <mjeanson@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -17,26 +17,76 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Version compare functions
+vercomp () {
+    set +u
+    if [[ "$1" == "$2" ]]; then
+        return 0
+    fi
+    local IFS=.
+    local i ver1=($1) ver2=($2)
+    # fill empty fields in ver1 with zeros
+    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
+        ver1[i]=0
+    done
+    for ((i=0; i<${#ver1[@]}; i++)); do
+        if [[ -z ${ver2[i]} ]]; then
+            # fill empty fields in ver2 with zeros
+            ver2[i]=0
+        fi
+        if ((10#${ver1[i]} > 10#${ver2[i]})); then
+            return 1
+        fi
+        if ((10#${ver1[i]} < 10#${ver2[i]})); then
+            return 2
+        fi
+    done
+    set -u
+    return 0
+}
+
 verlte() {
-    [  "$1" = "`printf '%s\n%s' $1 $2 | sort -V | head -n1`" ]
+    vercomp "$1" "$2"; local res="$?"
+    [ "$res" -eq "0" ] || [ "$res" -eq "2" ]
 }
 
 verlt() {
-    [ "$1" = "$2" ] && return 1 || verlte $1 $2
+    vercomp "$1" "$2"; local res="$?"
+    [ "$res" -eq "2" ]
 }
 
 vergte() {
-    [  "$1" = "`printf '%s\n%s' $1 $2 | sort -V | tail -n1`" ]
+    vercomp "$1" "$2"; local res="$?"
+    [ "$res" -eq "0" ] || [ "$res" -eq "1" ]
 }
 
 vergt() {
-    [ "$1" = "$2" ] && return 1 || vergte $1 $2
+    vercomp "$1" "$2"; local res="$?"
+    [ "$res" -eq "1" ]
 }
 
+verne() {
+    vercomp "$1" "$2"; local res="$?"
+    [ "$res" -ne "0" ]
+}
+
+# Required parameters
+arch=${arch:-}
+conf=${conf:-}
+build=${build:-}
+test_type=${test_type:-}
+
+SRCDIR="$WORKSPACE/src/lttng-tools"
+#TMPDIR="$WORKSPACE/tmp"
+PREFIX="$WORKSPACE/build"
+TAPDIR="$WORKSPACE/tap"
+
+
+# Create build and tmp directories
+rm -rf "$PREFIX" "$TAPDIR"
+mkdir -p "$PREFIX" "$TAPDIR"
 
-# Create build directory
-rm -rf $WORKSPACE/build
-mkdir -p $WORKSPACE/build
+#export TMPDIR
+CFLAGS="-g -O2"
 
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
@@ -48,34 +98,62 @@ UST_LIBS="$WORKSPACE/deps/lttng-ust/build/lib/"
 UST_JAVA="$WORKSPACE/deps/lttng-ust/build/share/java/"
 
 # babeltrace
-BABEL_INCS="$WORKSPACE/deps/babeltrace/build/include/"
+#BABEL_INCS="$WORKSPACE/deps/babeltrace/build/include/"
 BABEL_LIBS="$WORKSPACE/deps/babeltrace/build/lib/"
 BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/"
 
-PREFIX="$WORKSPACE/build"
+# pgrep
+PGREP=pgrep
 
 # 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"
+    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="$PATH:/usr/perl5/bin"
+    CPPFLAGS="-I/opt/csw/include"
+    LDFLAGS="-L/opt/csw/lib"
+    ;;
+
+macosx)
+    MAKE=make
+    TAR=tar
+    NPROC="getconf _NPROCESSORS_ONLN"
+    BISON="bison"
+    YACC="$BISON -y"
+    RUN_TESTS="no"
+
+    export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    CPPFLAGS="-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"
     ;;
 
 *)
@@ -84,7 +162,7 @@ solaris11)
     NPROC=nproc
     BISON="bison"
     YACC="$BISON -y"
-    CFLAGS=""
+    #CFLAGS=""
     RUN_TESTS="yes"
 
     PYTHON2=python2
@@ -98,25 +176,40 @@ solaris11)
     ;;
 esac
 
+case "$test_type" in
+base)
+	RUN_TESTS_LONG_REGRESSION="no"
+	;;
+full)
+	RUN_TESTS_LONG_REGRESSION="yes"
+	;;
+*)
+	RUN_TESTS_LONG_REGRESSION="no"
+	;;
+esac
+
+# Enter the source directory
+cd "$SRCDIR"
 
-# Run bootstrap prior to configure
+# Run bootstrap in the source directory prior to configure
 ./bootstrap
 
 # Get source version from configure script
-eval `grep '^PACKAGE_VERSION=' ./configure`
+eval "$(grep '^PACKAGE_VERSION=' ./configure)"
+PACKAGE_VERSION=$(echo "$PACKAGE_VERSION"| sed 's/\-pre$//')
 
 
 # Export build flags
 case "$conf" in
 no-ust)
-    export CPPFLAGS="-I$URCU_INCS"
-    export LDFLAGS="-L$URCU_LIBS"
+    CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS"
+    LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS"
     export LD_LIBRARY_PATH="$URCU_LIBS:$BABEL_LIBS:${LD_LIBRARY_PATH:-}"
     ;;
 
 *)
-    export CPPFLAGS="-I$URCU_INCS -I$UST_INCS"
-    export LDFLAGS="-L$URCU_LIBS -L$UST_LIBS"
+    CPPFLAGS="${CPPFLAGS:-} -I$URCU_INCS -I$UST_INCS"
+    LDFLAGS="${LDFLAGS:-} -L$URCU_LIBS -L$UST_LIBS"
     export LD_LIBRARY_PATH="$URCU_LIBS:$UST_LIBS:$BABEL_LIBS:${LD_LIBRARY_PATH:-}"
     ;;
 esac
@@ -128,115 +221,139 @@ else
     NO_UST="--disable-lttng-ust"
 fi
 
+# Most build configs require the python bindings
+CONF_OPTS="--enable-python-bindings"
+export PYTHON="python3"
+export PYTHON_CONFIG="/usr/bin/python3-config"
+
 # Set configure options for each build configuration
-CONF_OPTS=""
 case "$conf" in
 static)
     echo "Static build"
-    CONF_OPTS="--enable-static --disable-shared"
-    ;;
-
-python-bindings)
-    echo "Build with python bindings"
-    # We only support bindings built with Python 3
-    export PYTHON="python3"
-    export PYTHON_CONFIG="/usr/bin/python3-config"
-    CONF_OPTS="--enable-python-bindings"
+    CONF_OPTS+=" --enable-static --disable-shared"
     ;;
 
 no-ust)
     echo "Build without UST support"
-    CONF_OPTS="$NO_UST"
+    CONF_OPTS+=" $NO_UST"
     ;;
 
-java-agent)
-    echo "Build with Java Agents"
+agents)
+    echo "Enable Java Agents"
     export JAVA_HOME="/usr/lib/jvm/default-java"
     export CLASSPATH="$UST_JAVA/*:/usr/share/java/*"
-    CONF_OPTS="--enable-test-java-agent-all"
-    ;;
+    CONF_OPTS+=" --enable-test-java-agent-all"
 
-python-agent)
-    echo "Build with python agents"
+    echo "Enable Python agents"
     export PYTHONPATH="$UST_PYTHON2:$UST_PYTHON3"
-    CONF_OPTS="--enable-test-python-agent-all"
+    CONF_OPTS+=" --enable-test-python-agent-all"
     ;;
 
 relayd-only)
     echo "Build relayd only"
-    CONF_OPTS="--disable-bin-lttng --disable-bin-lttng-consumerd --disable-bin-lttng-crash --disable-bin-lttng-sessiond --disable-extras $NO_UST"
+    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=""
     ;;
 esac
 
 
 # Build type
-# oot : out-of-tree build
-# dist: build via make dist
-# *   : normal tree build
+# oot     : out-of-tree build
+# dist    : build via make dist
+# oot-dist: build via make dist out-of-tree
+# *       : normal tree build
 #
 # Make sure to move to the build_path and run configure
 # before continuing
-BUILD_PATH=$WORKSPACE
+BUILD_PATH=$SRCDIR
 case "$build" in
     oot)
         echo "Out of tree build"
         BUILD_PATH=$WORKSPACE/oot
-        mkdir -p $BUILD_PATH
-        cd $BUILD_PATH
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+        mkdir -p "$BUILD_PATH"
+        cd "$BUILD_PATH"
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
 
     dist)
-        echo "Distribution out of tree build"
-        BUILD_PATH=`mktemp -d`
+        echo "Distribution tarball in-tree build"
+
+        # Initial configure and generate tarball
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" "$SRCDIR/configure" $CONF_OPTS --enable-build-man-pages
+        $MAKE dist
+
+        BUILD_PATH="$(mktemp -d)"
+        cp ./*.tar.* "$BUILD_PATH/"
+        cd "$BUILD_PATH"
+
+        # Ignore level 1 of tar
+        $TAR xvf ./*.tar.* --strip 1
+
+        # Build in extracted source tree
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+        ;;
+
+    oot-dist)
+        echo "Distribution tarball out of tree build"
+        BUILD_PATH="$(mktemp -d)"
+        cd "$BUILD_PATH"
 
         # Initial configure and generate tarball
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" ./configure $CONF_OPTS --enable-build-man-pages
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" "$SRCDIR/configure" $CONF_OPTS --enable-build-man-pages
         $MAKE dist
 
-        mkdir -p $BUILD_PATH
-        cp *.tar.* $BUILD_PATH/
-        cd $BUILD_PATH
+        NEWSRC_PATH="$(mktemp -d)"
+        cp ./*.tar.* "$NEWSRC_PATH/"
+        cd "$NEWSRC_PATH"
 
         # Ignore level 1 of tar
-        $TAR xvf *.tar.* --strip 1
+        $TAR xvf ./*.tar.* --strip 1
+
+        BUILD_PATH="$(mktemp -d)"
+        cd "$BUILD_PATH"
 
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+        # Build oot from extracted sources
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" "$NEWSRC_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
 
     *)
-        BUILD_PATH=$WORKSPACE
         echo "Standard tree build"
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
 esac
 
 # BUILD!
-$MAKE -j `$NPROC` V=1
+$MAKE -j "$($NPROC)" V=1
 $MAKE install
 
 # Run tests
 if [ "$RUN_TESTS" = "yes" ]; then
+    cd tests || exit 1
+
     # Allow core dumps
     ulimit -c unlimited
 
     # Add 'babeltrace' binary to PATH
-    chmod +x $BABEL_BINS/babeltrace
+    chmod +x "$BABEL_BINS/babeltrace"
     export PATH="$PATH:$BABEL_BINS"
 
     # Prepare tap output dirs
-    rm -rf $WORKSPACE/tap
-    mkdir -p $WORKSPACE/tap
-    mkdir -p $WORKSPACE/tap/unit
-    mkdir -p $WORKSPACE/tap/fast_regression
-    mkdir -p $WORKSPACE/tap/with_bindings_regression
-
-    cd $BUILD_PATH/tests
+    rm -rf "$TAPDIR"
+    mkdir -p "$TAPDIR"
+    mkdir -p "$TAPDIR/unit"
+    mkdir -p "$TAPDIR/fast_regression"
+    mkdir -p "$TAPDIR/with_bindings_regression"
+    if [ "$RUN_TESTS_LONG_REGRESSION" = "yes" ]; then
+        mkdir -p "$TAPDIR/long_regression"
+    fi
 
     # Force the lttng-sessiond path to /bin/true to prevent the spawing of a
     # lttng-sessiond --daemonize on "lttng create"
@@ -244,43 +361,46 @@ if [ "$RUN_TESTS" = "yes" ]; then
 
     # Run 'unit_tests' and 'fast_regression' test suites for all configs except 'no-ust'
     if [ "$conf" != "no-ust" ]; then
-        prove --merge -v --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
-        prove --merge -v --exec '' - < $BUILD_PATH/tests/fast_regression --archive $WORKSPACE/tap/fast_regression/ || true
+        # Run 'unit_tests', 2.8 and up has a new test suite
+        if vergte "$PACKAGE_VERSION" "2.8"; then
+            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
+            prove --merge -v --exec '' - < "$BUILD_PATH/tests/fast_regression" --archive "$TAPDIR/fast_regression/" || true
+            prove --merge -v --exec '' - < "$BUILD_PATH/tests/with_bindings_regression" --archive "$TAPDIR/with_bindings_regression/" || true
+        fi
+        if [ "$RUN_TESTS_LONG_REGRESSION" = "yes" ]; then
+            prove --merge -v --exec '' - < "$BUILD_PATH/tests/long_regression" --archive "$TAPDIR/long_regression/" || true
+        fi
     else
         # Regression is disabled for now, we need to adjust the testsuite for no ust builds.
-        echo "Testsuite disabled for 'no-ust'. See job configuration for more info."
-    fi
-
-    # Run 'with_bindings_regression' test suite for 'python-bindings' config
-    if [ "$conf" = "python-bindings" ]; then
-        prove --merge -v --exec '' - < $WORKSPACE/tests/with_bindings_regression --archive $WORKSPACE/tap/with_bindings_regression/ || true
+        echo "Tests disabled for 'no-ust'."
     fi
 
     # TAP plugin is having a hard time with .yml files.
-    rm -f $WORKSPACE/tap/unit/meta.yml
-    rm -f $WORKSPACE/tap/fast_regression/meta.yml
-    rm -f $WORKSPACE/tap/with_bindings_regression/meta.yml
+    find "$TAPDIR" -name "meta.yml" -exec rm -f {} \;
 
     # And also with files without extension, so rename all result to *.tap
-    find $WORKSPACE/tap/unit/ -type f -exec mv {} {}.tap \;
-    find $WORKSPACE/tap/fast_regression/ -type f -exec mv {} {}.tap \;
-    find $WORKSPACE/tap/with_bindings_regression/ -type f -exec mv {} {}.tap \;
+    find "$TAPDIR/" -type f -exec mv {} {}.tap \;
+
+    cd -
 fi
 
 # Cleanup
 $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-find $WORKSPACE/build/bin -type f -perm -0500 -exec chrpath --delete {} \;
-find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
+find "$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \;
+find "$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
 
 # Remove libtool .la files
-find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+find "$PREFIX/lib" -name "*.la" -exec rm -f {} \;
 
 # Clean temp dir for dist build
 if [ "$build" = "dist" ]; then
-    cd $WORKSPACE
-    rm -rf $BUILD_PATH
+    cd "$SRCDIR"
+    rm -rf "$BUILD_PATH"
 fi
 
 # EOF