Specify we use a bash script

[lttng-ci.git] / lttng-tools / lttng-tools-master-test-joraj.sh

diff --git a/lttng-tools/lttng-tools-master-test-joraj.sh b/lttng-tools/lttng-tools-master-test-joraj.sh
index ba911628018e2a68bc5aa6bbe6a2847ef161512a..356425f963e703b95b8b35500709300f4eaf7af0 100755 (executable)
--- a/lttng-tools/lttng-tools-master-test-joraj.sh
+++ b/lttng-tools/lttng-tools-master-test-joraj.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+set -x
 # Create build directory
 rm -rf $WORKSPACE/build
 mkdir -p $WORKSPACE/build
@@ -17,8 +19,7 @@ BABEL_LIBS="$WORKSPACE/dependencies/babeltrace/build/lib/"
 
 PREFIX="$WORKSPACE/build"
 
-CONF_OPT=""
-
+CONF_OPTS=""
 if [ "$conf" = "no_ust" ]
 then
     export CPPFLAGS="-I$URCU_INCS"
@@ -33,7 +34,6 @@ fi
 
 ./bootstrap
 
-CONF_OPTS=""
 case "$conf" in
 # Currently disabled, ust doesn't seem to be built right for static linking.
 #static)
@@ -45,19 +45,23 @@ 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-python-bindings"
     ;;
 no_ust)
     echo "Build without UST support"
-    CONF_OPTS="--disable-lttng-ust"
+    CONF_OPTS+=" --disable-lttng-ust"
     ;;
 java_jul)
     echo "Build with java-jul UST support"
-    CONF_OPTS+=" --enable-java-agent-tests-jul --with-java-classpath=$UST_PREFIX/share/java/*"
+    CONF_OPTS+=" --enable-java-agent-tests-jul --with-java-classpath=$UST_PREFIX/share/java/\*"
+       ;;
+java_log4j)
+       echo "Build with java-log4j UST support"
+       CONF_OPTS+=" --enable-java-agent-tests-log4j --with-java-classpath=/usr/share/java/log4j-1.2.jar"
        ;;
 *)
     echo "Standard build"
-    CONF_OPTS=""
+    CONF_OPTS+=" "
     ;;
 esac
 
@@ -68,6 +72,9 @@ esac
 #
 # Make sure to move to the build_path and configure
 # before continuing
+echo "**************************************************"
+echo $CONF_OPTS
+echo "**************************************************"
 
 BUILD_PATH=$WORKSPACE
 case "$build" in
@@ -83,7 +90,7 @@ case "$build" in
                BUILD_PATH=`mktemp -d`
 
                # Initial configure and generate tarball
-               ./configure
+               ./configure $CONF_OPTS
                make dist
 
                mkdir -p $BUILD_PATH
@@ -170,3 +177,4 @@ find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
 if [ $build = "dist" ]; then
        rm -rf $BUILD_PATH
 fi
+set +x