jjb: lttng-tools: cleanup yaml job definition

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

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index e4a85ac31f0cb64f8676459c9a4e0304da75ad11..c7f1d5ea7f989535925317a4cf848b3afdf55427 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -151,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
@@ -216,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"
-
-    LTTNG_TOOLS_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"
-
-    LTTNG_TOOLS_RUN_TESTS="no"
-    ;;
-
 macos*)
     export MAKE=make
     export TAR=tar
@@ -274,14 +248,21 @@ cygwin|cygwin64|msys32|msys64)
     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)
     LTTNG_TOOLS_RUN_TESTS_LONG_REGRESSION="yes"
@@ -345,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)
@@ -507,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