X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Foverlap%2Ftest_overlap;h=f85a0ccc0551f2e61a08929e1af15b5bea4060c1;hb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;hp=e82307251baf033466970ca1c4d672ac430124f7;hpb=813e19a22d705c05664816f03f6cbdfa0a35a5ea;p=lttng-tools.git diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap index e82307251..f85a0ccc0 100755 --- a/tests/regression/ust/overlap/test_overlap +++ b/tests/regression/ust/overlap/test_overlap @@ -34,8 +34,6 @@ NUM_TESTS=259 source $TESTDIR/utils/utils.sh -print_test_banner "$TEST_DESC" - if [ ! -x "$CURDIR/demo/demo" ]; then BAIL_OUT "No UST nevents binary detected." fi @@ -47,8 +45,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 - } @@ -85,10 +84,10 @@ 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 @@ -110,7 +109,7 @@ 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 @@ -131,7 +130,7 @@ 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 @@ -152,7 +151,7 @@ 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 @@ -173,7 +172,7 @@ 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 @@ -194,7 +193,7 @@ 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 @@ -215,7 +214,7 @@ 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 @@ -239,7 +238,7 @@ 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 @@ -260,7 +259,7 @@ 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 @@ -281,7 +280,7 @@ 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 @@ -309,7 +308,7 @@ 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 @@ -330,7 +329,7 @@ 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 @@ -351,7 +350,7 @@ 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 @@ -372,7 +371,7 @@ 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 @@ -398,7 +397,7 @@ 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 @@ -418,11 +417,11 @@ 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 @@ -440,10 +439,10 @@ 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 @@ -464,7 +463,7 @@ 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 @@ -485,7 +484,7 @@ 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 @@ -506,7 +505,7 @@ 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 @@ -527,7 +526,7 @@ 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 @@ -548,7 +547,7 @@ 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 @@ -569,13 +568,13 @@ 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 @@ -594,12 +593,12 @@ 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 @@ -615,6 +614,8 @@ test_disable_wildcard_overlap() plan_tests $NUM_TESTS +print_test_banner "$TEST_DESC" + TESTS=( "test_enable_wildcard_filter" "test_enable_wildcard_filter_2" @@ -650,7 +651,7 @@ 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]}