Use pkgconfig to detect and configure liblttng-ust

[lttng-tools.git] / tests / regression / ust / overlap / test_overlap

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index f85a0ccc0551f2e61a08929e1af15b5bea4060c1..66c55ca916defd2b4fe5b00df6b2c8ce0668dad7 100755 (executable)
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -34,10 +34,6 @@ NUM_TESTS=259
 
 source $TESTDIR/utils/utils.sh
 
-if [ ! -x "$CURDIR/demo/demo" ]; then
-       BAIL_OUT "No UST nevents binary detected."
-fi
-
 # MUST set TESTDIR before calling those functions
 
 run_demo_app()
@@ -91,7 +87,7 @@ test_enable_simple_wildcard()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
 
@@ -113,7 +109,7 @@ test_enable_wildcard_filter()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -134,7 +130,7 @@ test_enable_wildcard_filter_2()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -155,7 +151,7 @@ test_enable_wildcard_filter_3()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -176,7 +172,7 @@ test_enable_wildcard_filter_4()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -197,7 +193,7 @@ test_enable_wildcard_filter_5()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -218,7 +214,7 @@ test_enable_wildcard_filter_6()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
        trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -242,7 +238,7 @@ test_enable_wildcard_filter_7()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -263,7 +259,7 @@ test_enable_wildcard_filter_8()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -284,7 +280,7 @@ test_enable_same_wildcard_filter()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -312,7 +308,7 @@ test_enable_same_wildcard_filter_2()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -333,7 +329,7 @@ test_enable_same_wildcard_filter_3()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -354,7 +350,7 @@ test_enable_same_wildcard_filter_4()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -375,7 +371,7 @@ test_enable_same_event_filter()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
        trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -401,7 +397,7 @@ test_disable_same_wildcard_filter()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -425,7 +421,7 @@ test_enable_bad_wildcard()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -446,7 +442,7 @@ test_enable_simple_wildcard_2()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -467,7 +463,7 @@ test_enable_loglevel_overlap()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -488,7 +484,7 @@ test_enable_loglevel_only_overlap()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -509,7 +505,7 @@ test_enable_loglevel_overlap_2()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -530,7 +526,7 @@ test_enable_same_wildcard_loglevels()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -551,7 +547,7 @@ test_enable_same_event_loglevels()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
        trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -578,7 +574,7 @@ test_disable_simple_wildcard()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        # No events are expected.
        trace_match_no_demo_events
@@ -602,7 +598,7 @@ test_disable_wildcard_overlap()
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        # Expect only "ust_tests_demo" events.
        trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
@@ -616,6 +612,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+if [ -x "$CURDIR/demo/demo" ]; then
+       foundbin=1
+else
+       foundbin=0
+fi
+
+skip $foundbin "No UST nevents binary detected. Skipping all tests." $NUM_TESTS && exit 0
+
 TESTS=(
        "test_enable_wildcard_filter"
        "test_enable_wildcard_filter_2"
@@ -656,7 +660,7 @@ while [ "$i" -lt "$TEST_COUNT" ]; do
        # Execute test
        ${TESTS[$i]}
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        rm -rf $TRACE_PATH