summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
fbeb28a)
Change-Id: Ic881c44577f8dc291363e219386b512bb340cbf8
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
fi
if [ "{buildtype}" = "slesbuild" ] ; then
echo "TAP_AUTOTIME=0" >> env.properties
fi
if [ "{buildtype}" = "slesbuild" ] ; then
echo "TAP_AUTOTIME=0" >> env.properties
+ # On SLES, force log4j to 2.17.1
+ echo "LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION=2.17.1" >> env.properties
fi
echo "liburcu_conf=$liburcu_conf" >> env.properties
echo "babeltrace_conf=$babeltrace_conf" >> env.properties
fi
echo "liburcu_conf=$liburcu_conf" >> env.properties
echo "babeltrace_conf=$babeltrace_conf" >> env.properties
"-DargLine=-Djava.library.path=${WORKSPACE}/deps/build/${LIBDIR_ARCH}"
'-Dgroups=!domain:log4j2'
)
"-DargLine=-Djava.library.path=${WORKSPACE}/deps/build/${LIBDIR_ARCH}"
'-Dgroups=!domain:log4j2'
)
env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn -version
env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn -version
+
+ if [[ -n "${LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION:-}" ]] ; then
+ env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn versions:use-dep-version -Dincludes=org.apache.logging.log4j:'*' -DdepVersion="${LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION}"
+ fi
+
mkdir -p "${WORKSPACE}/log"
env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" lttng-sessiond -b -vvv 1>"${WORKSPACE}/log/lttng-ust-java-tests-lttng-sessiond.log" 2>&1
mkdir -p "${WORKSPACE}/log"
env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" lttng-sessiond -b -vvv 1>"${WORKSPACE}/log/lttng-ust-java-tests-lttng-sessiond.log" 2>&1
- env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn "${LTTNG_UST_JAVA_TESTS_MAVEN_OPTS[@]}" clean verify || exit_status=1
+ env "${LTTNG_UST_JAVA_TESTS_ENV[@]}" mvn "${LTTNG_UST_JAVA_TESTS_MAVEN_OPTS[@]}" clean compile dependency:build-classpath dependency:tree verify || exit_status=1
killall lttng-sessiond
cd "${OWD}"
killall lttng-sessiond
cd "${OWD}"