X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=b3f9b519ff91fa7443540294d39d81f5e5a56c54;hb=c364f6e0f99c54fe8bf54c791af9f368683c9678;hp=48c8b7401c7e5721d26223a6d10bed72ebf2d4d1;hpb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;p=lttng-tools.git

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index 48c8b7401..b3f9b519f 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -27,7 +27,7 @@ TESTAPP_PATH="$CURDIR/$TESTAPP_NAME"
 SESSION_NAME="jul"
 EVENT_NAME="JTestLTTng"
 EVENT_NAME2="JTestLTTng2"
-JAVA_CP="$CURDIR:/usr/local/share/java/liblttng-ust-agent.jar:/usr/share/java/liblttng-ust-agent.jar"
+JAVA_CP="$CURDIR:$CLASSPATH"
 
 NUM_TESTS=155
 
@@ -39,7 +39,7 @@ function run_app
 	local fire_second_tp=$2
 
 	#FIXME: app should have synchro.
-	java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1
+	java -cp $JAVA_CP -Djava.library.path="$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1
 }
 
 function run_app_background
@@ -347,7 +347,7 @@ function test_jul_disable_all()
 	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
 	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
 
-	disable_jul_lttng_event $SESSION_NAME '*'
+	disable_jul_lttng_event $SESSION_NAME -a
 
 	start_lttng_tracing_ok $SESSION_NAME