-if [ ! -f "$TESTAPP_PATH.class" ]; then
- withapp=0
-else
- withapp=1
-fi
-
-skip $withapp "LOG4J support is needed. Skipping all tests." $NUM_TESTS ||
-{
- start_lttng_sessiond
-
- tests=(
- test_log4j_multi_session_disable_wildcard
- test_log4j_multi_session_disable_wildcard_begin
- test_log4j_multi_session_disable_wildcard_middle
- test_log4j_multi_session_disable_wildcard_end
- test_log4j_multi_session_disable
- test_log4j_disable
- test_log4j_disable_enable
- test_log4j_disable_all
- test_log4j_filtering
- test_log4j_multi_session_loglevel
- test_log4j_destroy_session
- test_log4j_loglevel
- test_log4j_loglevel_multiple
- test_log4j_before_start
- test_log4j_after_start
- test_log4j_multi_session
- test_log4j_filter_loglevel
- )
-
- for fct_test in ${tests[@]};
- do
- TRACE_PATH=$(mktemp --tmpdir -d tmp.test_java_log4j_trace_path.XXXXXX)
-
- ${fct_test}
- if [ $? -ne 0 ]; then
- break;
- fi
- rm -rf $TRACE_PATH
- done
-
- stop_lttng_sessiond
-}
+bail_out_if_no_babeltrace
+
+test -f "$TESTAPP_PATH.class"
+ok $? "Testapp '$TESTAPP_NAME' present"
+
+start_lttng_sessiond
+
+tests=(
+ test_log4j_multi_session_disable_wildcard
+ test_log4j_multi_session_disable_wildcard_begin
+ test_log4j_multi_session_disable_wildcard_middle
+ test_log4j_multi_session_disable_wildcard_end
+ test_log4j_multi_session_disable
+ test_log4j_disable
+ test_log4j_disable_enable
+ test_log4j_disable_all
+ test_log4j_filtering
+ test_log4j_multi_session_loglevel
+ test_log4j_destroy_session
+ test_log4j_loglevel
+ test_log4j_loglevel_multiple
+ test_log4j_before_start
+ test_log4j_after_start
+ test_log4j_multi_session
+ test_log4j_filter_loglevel
+)
+
+for fct_test in "${tests[@]}";
+do
+ TRACE_PATH=$(mktemp --tmpdir -d tmp.test_java_log4j_trace_path.XXXXXX)
+
+ ${fct_test}
+
+ rm -rf "$TRACE_PATH"
+done
+
+stop_lttng_sessiond