X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Foverlap%2Ftest_overlap;h=66c55ca916defd2b4fe5b00df6b2c8ce0668dad7;hb=53b00091d773d915a2ee1771fe2b1adbb5af880d;hp=add8ff140ee5f3bc4c4e9fab33c8f2e29658f9cf;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7;p=lttng-tools.git diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap index add8ff140..66c55ca91 100755 --- 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() @@ -45,8 +41,9 @@ run_demo_app() cd $CURDIR/demo # Start test + diag "Running application" ./demo-trace >/dev/null 2>&1 - ok $? "Start application" + ok $? "Application done" cd - } @@ -83,14 +80,14 @@ test_enable_simple_wildcard() diag "Simple wildcard overlap" - enable_ust_lttng_event $SESSION_NAME "$event_wild1" - enable_ust_lttng_event $SESSION_NAME "$event_wild2" + 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 @@ -108,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 $? @@ -129,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 $? @@ -150,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 $? @@ -171,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 $? @@ -192,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 $? @@ -213,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 @@ -237,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 $? @@ -258,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 $? @@ -279,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 $? @@ -307,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 $? @@ -328,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 $? @@ -349,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 $? @@ -370,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 @@ -396,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 $? @@ -416,15 +413,15 @@ test_enable_bad_wildcard() diag "Enable bad wildcard" - enable_ust_lttng_event $SESSION_NAME "$event_wild1" - enable_ust_lttng_event $SESSION_NAME "$event_wild2" - enable_ust_lttng_event $SESSION_NAME "$event_wild3" + enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1" + 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 $? @@ -438,14 +435,14 @@ test_enable_simple_wildcard_2() diag "Simple wildcard 2" - enable_ust_lttng_event $SESSION_NAME "$event_wild1" - enable_ust_lttng_event $SESSION_NAME "$event_wild2" + 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 $? @@ -462,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 $? @@ -483,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 $? @@ -504,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 $? @@ -525,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 $? @@ -546,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 @@ -567,17 +564,17 @@ test_disable_simple_wildcard() diag "Disable simple wildcard" - enable_ust_lttng_event $SESSION_NAME "$event_wild1" - enable_ust_lttng_event $SESSION_NAME "$event_wild2" + enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1" + enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2" 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 @@ -592,16 +589,16 @@ test_disable_wildcard_overlap() diag "Disable wildcard overlap" - enable_ust_lttng_event $SESSION_NAME "$event_wild1" - enable_ust_lttng_event $SESSION_NAME "$event_wild2" + enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1" + enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2" 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 @@ -615,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" @@ -650,12 +655,12 @@ while [ "$i" -lt "$TEST_COUNT" ]; do TRACE_PATH=$(mktemp -d) - create_lttng_session $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME $TRACE_PATH # Execute test ${TESTS[$i]} - destroy_lttng_session $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME rm -rf $TRACE_PATH