build=${build:-}
cc=${cc:-}
+# Controls if the tests are run
+LTTNG_UST_RUN_TESTS="${LTTNG_UST_RUN_TESTS:=yes}"
DEPS_INC="$WORKSPACE/deps/build/include"
DEPS_LIB="$WORKSPACE/deps/build/lib"
export NPROC=nproc
export PYTHON="python3"
export PYTHON_CONFIG="python3-config"
- export CLASSPATH='/usr/share/java/*'
+ export CLASSPATH='/usr/share/java/log4j-api.jar:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar'
;;
esac
echo "Java and Python agents configuration"
CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
+
+ # Explicitly add '--enable-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-java-agent-log4j2")
+ fi
;;
debug-rcu)
# Run tests, don't fail now, we want to run the archiving steps
failed_tests=0
-$MAKE --keep-going check || failed_tests=1
+if [ "$LTTNG_UST_RUN_TESTS" = "yes" ]; then
+ $MAKE --keep-going check || failed_tests=1
-# Copy tap logs for the jenkins tap parser before cleaning the build dir
-rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
+ # Copy tap logs for the jenkins tap parser before cleaning the build dir
+ rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
-# The test suite prior to 2.8 did not produce TAP logs
-if verlt "$PACKAGE_VERSION" "2.8"; then
- mkdir -p "$WORKSPACE/tap/no-log"
- echo "1..1" > "$WORKSPACE/tap/no-log/tests.log"
- echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log"
+ # The test suite prior to 2.8 did not produce TAP logs
+ if verlt "$PACKAGE_VERSION" "2.8"; then
+ mkdir -p "$WORKSPACE/tap/no-log"
+ echo "1..1" > "$WORKSPACE/tap/no-log/tests.log"
+ echo "ok 1 - Test suite doesn't support logging" >> "$WORKSPACE/tap/no-log/tests.log"
+ fi
fi
# Clean the build directory