projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: use babeltrace2 for all tests
[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 8b045025b0f1d0f8e463116e36bfed899c98bd99..ed4302879e5ac183f3de1b2e2d987773846e3ce1 100755
(executable)
--- a/
tests/regression/ust/java-log4j/test_java_log4j
+++ b/
tests/regression/ust/java-log4j/test_java_log4j
@@
-80,8
+80,8
@@
function enable_log4j_filter_loglevel_only()
function test_log4j_before_start ()
{
function test_log4j_before_start ()
{
- local file_sync_after_first=$(mktemp -
u
)
- local file_sync_before_last=$(mktemp -
u
)
+ local file_sync_after_first=$(mktemp -
-tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX"
)
+ local file_sync_before_last=$(mktemp -
-tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX"
)
diag "Test LOG4J application BEFORE tracing starts"
create_lttng_session_ok $SESSION_NAME $TRACE_PATH
diag "Test LOG4J application BEFORE tracing starts"
create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@
-661,6
+661,8
@@
plan_tests $NUM_TESTS
print_test_banner "$TEST_DESC"
print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
+
if [ ! -f "$TESTAPP_PATH.class" ]; then
withapp=0
else
if [ ! -f "$TESTAPP_PATH.class" ]; then
withapp=0
else
@@
-693,7
+695,7
@@
skip $withapp "LOG4J support is needed. Skipping all tests." $NUM_TESTS ||
for fct_test in ${tests[@]};
do
for fct_test in ${tests[@]};
do
- TRACE_PATH=$(mktemp -
d
)
+ TRACE_PATH=$(mktemp -
-tmpdir -d tmp.test_java_log4j_trace_path.XXXXXX
)
${fct_test}
if [ $? -ne 0 ]; then
${fct_test}
if [ $? -ne 0 ]; then
This page took
0.024786 seconds
and
4
git commands to generate.