X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=c7f1d5ea7f989535925317a4cf848b3afdf55427;hb=eba6297c0fc1194fbf737caadd69b85a5512467f;hp=017beb9cb6126bf07618122eecf1f2737358a7ab;hpb=c1bede3c5fe828179c6f14dc7237aafab5067352;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 017beb9..c7f1d5e 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -82,6 +82,24 @@ failed_configure() {
     exit 1
 }
 
+set_execute_traversal_bit()
+{
+    path=$1
+
+    level="$path"
+    if [ ! -d "$path" ]; then
+        fail "Path is not a directory"
+    fi
+    while level="$(dirname "$level")"
+    do
+        if [ "$level" = / ]; then
+            break
+        fi
+        chmod a+x "$level"
+    done
+    chmod a+x "$path"
+}
+
 # Required variables
 WORKSPACE=${WORKSPACE:-}
 
@@ -133,6 +151,7 @@ export BABELTRACE_PLUGIN_PATH="$DEPS_LIB/babeltrace2/plugins/"
 export LIBBABELTRACE2_PLUGIN_PROVIDER_DIR="$DEPS_LIB/babeltrace2/plugin-providers/"
 
 export CFLAGS="-g -O2"
+export CXXFLAGS="-g -O2"
 
 # Set compiler variables
 case "$cc" in
@@ -198,33 +217,6 @@ fi
 
 # Set platform variables
 case "$arch" in
-sol10-i386)
-    export MAKE=gmake
-    export TAR=gtar
-    export NPROC=gnproc
-    export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
-    export CPPFLAGS="-I/opt/csw/include -D_XOPEN_SOURCE=500 $CPPFLAGS"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib $LDFLAGS"
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/csw/lib/pkgconfig"
-    export PYTHON="python3"
-    export PYTHON_CONFIG="python3-config"
-
-    RUN_TESTS="no"
-    ;;
-
-sol11-i386)
-    export MAKE=gmake
-    export TAR=gtar
-    export NPROC=nproc
-    export PATH="/opt/csw/bin:$PATH:/usr/perl5/bin"
-    export CPPFLAGS="-D_XOPEN_SOURCE=500 $CPPFLAGS"
-    export PYTHON="python3"
-    export PYTHON_CONFIG="python3-config"
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib/pkgconfig"
-
-    RUN_TESTS="no"
-    ;;
-
 macos*)
     export MAKE=make
     export TAR=tar
@@ -232,10 +224,10 @@ macos*)
     export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
     export CPPFLAGS="-I/opt/local/include $CPPFLAGS"
     export LDFLAGS="-L/opt/local/lib $LDFLAGS"
-    export PYTHON="python3"
-    export PYTHON_CONFIG="python3-config"
+    export PYTHON="python3.9"
+    export PYTHON_CONFIG="python3.9-config"
 
-    RUN_TESTS="no"
+    LTTNG_TOOLS_RUN_TESTS="no"
     ;;
 
 cygwin|cygwin64|msys32|msys64)
@@ -243,7 +235,7 @@ cygwin|cygwin64|msys32|msys64)
     export TAR=tar
     export NPROC=nproc
 
-    RUN_TESTS="no"
+    LTTNG_TOOLS_RUN_TESTS="no"
     ;;
 
 *)
@@ -251,25 +243,32 @@ cygwin|cygwin64|msys32|msys64)
     export TAR=tar
     export NPROC=nproc
 
-    RUN_TESTS="yes"
+    LTTNG_TOOLS_RUN_TESTS="yes"
 
     PYTHON2=python2
     PYTHON3=python3
 
-    P2_VERSION=$($PYTHON2 -c "import sys;print(sys.version[:3])")
-    P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+    P2_VERSION=$($PYTHON2 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
+    P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
     DEPS_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
     DEPS_PYTHON3="$WORKSPACE/deps/build/lib/python$P3_VERSION/site-packages"
     ;;
 esac
 
+# The missing-field-initializers warning code is very dumb in GCC 4.8 on
+# SLES12, disable it even if it's available.
+if [ "$arch" = "sles12sp5" ]; then
+	CFLAGS="$CFLAGS -Wno-missing-field-initializers"
+	CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"
+fi
+
 case "$test_type" in
 full)
-    RUN_TESTS_LONG_REGRESSION="yes"
+    LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="yes"
     ;;
 *)
-    RUN_TESTS_LONG_REGRESSION="no"
+    LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="no"
     ;;
 esac
 
@@ -327,10 +326,15 @@ agents)
     echo "Java and Python agents configuration"
 
     export JAVA_HOME="/usr/lib/jvm/default-java"
-    export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/*"
+    export CLASSPATH="$DEPS_JAVA/lttng-ust-agent-all.jar:/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
     export PYTHONPATH="$DEPS_PYTHON2:$DEPS_PYTHON3"
 
     CONF_OPTS+=("--enable-test-java-agent-all" "--enable-test-python-agent-all")
+
+    # Explicitly add '--enable-test-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
+    if verlt "$PACKAGE_VERSION" "2.14"; then
+        CONF_OPTS+=("--enable-test-java-agent-log4j2")
+    fi
     ;;
 
 relayd-only)
@@ -432,7 +436,7 @@ $MAKE install DESTDIR="$WORKSPACE"
 
 # Run tests for all configs except 'no-ust'
 failed_tests=0
-if [ "$RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
+if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
     # Allow core dumps
     ulimit -c unlimited
 
@@ -449,6 +453,12 @@ if [ "$RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
 	# CI and root jobs since we always run root tests against a `snapshot`
 	# of the host.
 	if [ "$(id -u)" == "0" ]; then
+		# Allow the traversal of all directories leading to the
+		# DEPS_LIBS directory to enable test app run by temp users to
+		# access lttng-ust.
+		set_execute_traversal_bit "$DEPS_LIB"
+		# Allow `all` to interact with all deps libs.
+		chmod a+rwx -R "$DEPS_LIB"
 		export LTTNG_ENABLE_DESTRUCTIVE_TESTS="will-break-my-system"
 	fi
         make --keep-going check || failed_tests=1
@@ -464,7 +474,7 @@ if [ "$RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
 	cd ..
     fi
 
-    if [ "$RUN_TESTS_LONG_REGRESSION" = "yes" ]; then
+    if [ "$LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION" = "yes" ]; then
         cd tests
         mkdir -p "$TAPDIR/long_regression"
         prove --merge -v --exec '' - < long_regression --archive "$TAPDIR/long_regression/" || failed_tests=1
@@ -483,12 +493,16 @@ fi
 # Clean the build directory
 $MAKE clean
 
-# Cleanup rpath in executables and shared libraries
+# Cleanup rpath in executables
 find "$WORKSPACE/$PREFIX/bin" -type f -perm -0500 -exec chrpath --delete {} \;
-find "$WORKSPACE/$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
 
-# Remove libtool .la files
-find "$WORKSPACE/$PREFIX/lib" -name "*.la" -exec rm -f {} \;
+# Some configs don't build liblttng-ctl
+if [ -d "$WORKSPACE/$PREFIX/lib" ]; then
+    # Cleanup rpath in shared libraries
+    find "$WORKSPACE/$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
+    # Remove libtool .la files
+    find "$WORKSPACE/$PREFIX/lib" -name "*.la" -exec rm -f {} \;
+fi
 
 # Exit with failure if any of the tests failed
 exit $failed_tests