X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ust%2Fbuild.sh;h=be9cb19da40848213e7105d81c6e0fc10afb9513;hb=f89243aeb6e359a3737f791cba6ad25e92def835;hp=4f36982b9b019cb8af0d8cf3a9733c1e8a43c096;hpb=1d56e325ac199eb068729afbb04b3e954cb23061;p=lttng-ci.git

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 4f36982..be9cb19 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -197,7 +197,7 @@ static)
 agents)
     echo "Java and Python agents configuration"
 
-    export CLASSPATH="/usr/share/java/log4j-1.2.jar"
+    export CLASSPATH='/usr/share/java/*'
     CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
     ;;
 
@@ -298,6 +298,13 @@ $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"
 
+# 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
+
 # Clean the build directory
 $MAKE clean