projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test fix: test_fork can hang while waiting for child pids
[lttng-tools.git]
/
tests
/
regression
/
ust
/
java-log4j
/
test_java_log4j
diff --git
a/tests/regression/ust/java-log4j/test_java_log4j
b/tests/regression/ust/java-log4j/test_java_log4j
index cdc0c4c34470c6751da5b9ebdfbc9af62c975825..5c0f03d5be3bcf4cd30479e71435acd64e5d6496 100755
(executable)
--- a/
tests/regression/ust/java-log4j/test_java_log4j
+++ b/
tests/regression/ust/java-log4j/test_java_log4j
@@
-27,7
+27,7
@@
TESTAPP_PATH="$CURDIR/$TESTAPP_NAME"
SESSION_NAME="log4j"
EVENT_NAME="log4j-event"
EVENT_NAME2="log4j-event-2"
SESSION_NAME="log4j"
EVENT_NAME="log4j-event"
EVENT_NAME2="log4j-event-2"
-JAVA_CP="$CURDIR:
/usr/local/share/java/liblttng-ust-agent.jar:/usr/share/java/*
"
+JAVA_CP="$CURDIR:
$CLASSPATH
"
OUTPUT_DEST="/dev/null"
NUM_TESTS=155
OUTPUT_DEST="/dev/null"
NUM_TESTS=155
@@
-40,7
+40,7
@@
function run_app
local fire_second_tp=$2
# FIXME: test app should have synchro.
local fire_second_tp=$2
# FIXME: test app should have synchro.
- java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $debug_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 $debug_tp $fire_second_tp >/dev/null 2>&1
}
function run_app_background
}
function run_app_background
@@
-348,7
+348,7
@@
function test_log4j_disable_all()
enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
- disable_log4j_lttng_event $SESSION_NAME
'*'
+ disable_log4j_lttng_event $SESSION_NAME
-a
start_lttng_tracing_ok $SESSION_NAME
start_lttng_tracing_ok $SESSION_NAME
This page took
0.025299 seconds
and
4
git commands to generate.