X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=848f25549e9d81cf6e269d4997ac95b418cb02dd;hb=2bd4c4ca63118876e21337a6b3d550bf39535d5a;hp=a41fbfb3d76d4b9741cc9baa4ef43a55dda6bc40;hpb=cd937fce43597dc7a9bcbe9e0cfb367bfaa9b8f9;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index a41fbfb..848f255 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -103,7 +103,7 @@ set_execute_traversal_bit()
 # Required variables
 WORKSPACE=${WORKSPACE:-}
 
-arch=${arch:-}
+platform=${platform:-}
 conf=${conf:-}
 build=${build:-}
 cc=${cc:-}
@@ -142,7 +142,7 @@ export TMPDIR="$tmpdir"
 # the trace reader in its test suite or that we move to only supporting
 # babeltrace2
 if [ -x "$DEPS_BIN/babeltrace2" ]; then
-	ln -s "$DEPS_BIN/babeltrace2" "$DEPS_BIN/babeltrace"
+    ln -s "$DEPS_BIN/babeltrace2" "$DEPS_BIN/babeltrace"
 fi
 
 # When using babeltrace2 make sure that it finds its plugins and
@@ -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
@@ -204,7 +205,7 @@ clang-7)
     ;;
 *)
     if [ "x$cc" != "x" ]; then
-	    export CC="$cc"
+        export CC="$cc"
     fi
     ;;
 esac
@@ -215,34 +216,7 @@ if [ "x${CC:-}" != "x" ]; then
 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"
-    ;;
-
+case "$platform" in
 macos*)
     export MAKE=make
     export TAR=tar
@@ -250,8 +224,8 @@ 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.9"
-    export PYTHON_CONFIG="python3.9-config"
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
 
     LTTNG_TOOLS_RUN_TESTS="no"
     ;;
@@ -274,14 +248,23 @@ 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])")
+    if command -v $PYTHON2 >/dev/null 2>&1; then
+        P2_VERSION=$($PYTHON2 -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"
+    fi
 
-    DEPS_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
+    P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
     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 [[ $platform = 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"
@@ -346,7 +329,7 @@ agents)
 
     export JAVA_HOME="/usr/lib/jvm/default-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"
+    export PYTHONPATH="${DEPS_PYTHON2:-}${DEPS_PYTHON2:+:}$DEPS_PYTHON3"
 
     CONF_OPTS+=("--enable-test-java-agent-all" "--enable-test-python-agent-all")
 
@@ -465,21 +448,26 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
 
     # Run 'unit_tests', 2.8 and up has a new test suite
     if vergte "$PACKAGE_VERSION" "2.8"; then
-	# It is implied that tests depending on LTTNG_ENABLE_DESTRUCTIVE_TESTS
-	# only run for the root user. Note that here `destructive` means that
-	# operations are performed at the host level (add user etc.) that
-	# effectively modify the host. Running those tests are acceptable on our
-	# 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
+        # It is implied that tests depending on LTTNG_ENABLE_DESTRUCTIVE_TESTS
+        # only run for the root user. Note that here `destructive` means that
+        # operations are performed at the host level (add user etc.) that
+        # effectively modify the host. Running those tests are acceptable on our
+        # 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"
+
+            # Some destructive tests play with the system clock, disable timesyncd
+            systemctl stop systemd-timesyncd.service || true
+        fi
+
         make --keep-going check || failed_tests=1
         rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$TAPDIR"
     else
@@ -490,14 +478,14 @@ if [ "$LTTNG_TOOLS_RUN_TESTS" = "yes" ] && [ "$conf" != "no-ust" ]; then
         prove --merge -v --exec '' - < unit_tests --archive "$TAPDIR/unit/" || failed_tests=1
         prove --merge -v --exec '' - < fast_regression --archive "$TAPDIR/fast_regression/" || failed_tests=1
         prove --merge -v --exec '' - < with_bindings_regression --archive "$TAPDIR/with_bindings_regression/" || failed_tests=1
-	cd ..
+        cd ..
     fi
 
     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
-	cd ..
+        cd ..
     fi
 
     # TAP plugin is having a hard time with .yml files.