Fix: tests: skip tests on static build

[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 ab853f31ae7b4927ccfa488bcab1ff9c6283d4ab..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()
@@ -87,11 +83,11 @@ test_enable_simple_wildcard()
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
 
@@ -109,11 +105,11 @@ test_enable_wildcard_filter()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -130,11 +126,11 @@ test_enable_wildcard_filter_2()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -151,11 +147,11 @@ test_enable_wildcard_filter_3()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -172,11 +168,11 @@ test_enable_wildcard_filter_4()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -193,11 +189,11 @@ test_enable_wildcard_filter_5()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -214,11 +210,11 @@ test_enable_wildcard_filter_6()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        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
@@ -238,11 +234,11 @@ test_enable_wildcard_filter_7()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -259,11 +255,11 @@ test_enable_wildcard_filter_8()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -280,11 +276,11 @@ test_enable_same_wildcard_filter()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -308,11 +304,11 @@ test_enable_same_wildcard_filter_2()
            fail "Enable event $event_name with filtering for session $sess_name twice failure NOT detected"
        fi
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -329,11 +325,11 @@ test_enable_same_wildcard_filter_3()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -350,11 +346,11 @@ test_enable_same_wildcard_filter_4()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0&&1==0"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -371,11 +367,11 @@ test_enable_same_event_filter()
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        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
@@ -397,11 +393,11 @@ test_disable_same_wildcard_filter()
 
        disable_ust_lttng_event $SESSION_NAME "ust*"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -421,11 +417,11 @@ test_enable_bad_wildcard()
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild3"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -442,11 +438,11 @@ test_enable_simple_wildcard_2()
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
        enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -463,11 +459,11 @@ test_enable_loglevel_overlap()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -484,11 +480,11 @@ test_enable_loglevel_only_overlap()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
        enable_ust_lttng_event_loglevel_only $SESSION_NAME "$event_wild2" "TRACE_CRIT"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -505,11 +501,11 @@ test_enable_loglevel_overlap_2()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -526,11 +522,11 @@ test_enable_same_wildcard_loglevels()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -547,11 +543,11 @@ test_enable_same_event_loglevels()
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
        enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        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
@@ -574,11 +570,11 @@ test_disable_simple_wildcard()
        disable_ust_lttng_event $SESSION_NAME "$event_wild1"
        disable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
 
        # No events are expected.
        trace_match_no_demo_events
@@ -598,11 +594,11 @@ test_disable_wildcard_overlap()
 
        disable_ust_lttng_event $SESSION_NAME "$event_wild1"
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        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