Tests: lttng-ust-getcpu-override-test cache and error-check sysconf()

[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 631db84cbd9383b3e51d507cd0cc37f3358ce267..69d6c66d2979c99c98c51cd72e0dba3f8e65438e 100755 (executable)
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -30,12 +30,10 @@ NUM_DEMO1_2_EVENT=1
 NUM_DEMO2_EVENT=5
 NUM_DEMO3_EVENT=1
 
-NUM_TESTS=260
+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,14 +84,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
 
@@ -110,11 +109,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -131,11 +130,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -152,11 +151,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -173,11 +172,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -194,11 +193,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -215,11 +214,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
        trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -239,11 +238,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -260,11 +259,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -281,11 +280,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -301,20 +300,19 @@ test_enable_same_wildcard_filter_2()
 
        enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
 
-       # Enabling the same events with same filters should fail
+       # Enabling the same events with same filters should fail. This one is expected to fail.
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_wild2" -s $SESSION_NAME -u --filter "1==1" >/dev/null 2>&1
-
-       if [ $? -eq 1 ]; then
+       if [ $? -ne 0 ]; then
            pass "Enable event $event_name with filtering for session $sess_name twice failure detected"
        else
-           fail "Enable event $event_name with filtering for session $sess_name twice failure detected"
+           fail "Enable event $event_name with filtering for session $sess_name twice failure NOT detected"
        fi
 
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -331,11 +329,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -352,11 +350,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -373,13 +371,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"
 
-       disable_ust_lttng_event $SESSION_NAME "ust*"
-
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
        trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -401,11 +397,11 @@ test_disable_same_wildcard_filter()
 
        disable_ust_lttng_event $SESSION_NAME "ust*"
 
-       start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -421,15 +417,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_no_demo_events
        return $?
@@ -443,14 +439,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -467,11 +463,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -488,11 +484,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -509,11 +505,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -530,11 +526,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_match_all_demo_events
        return $?
@@ -551,11 +547,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
        trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -572,17 +568,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        # No events are expected.
        trace_match_no_demo_events
@@ -597,16 +593,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 >/dev/null 2>&1
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_demo_app
 
-       stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
+       stop_lttng_tracing_ok $SESSION_NAME
 
        # Expect only "ust_tests_demo" events.
        trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
@@ -618,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"
@@ -653,16 +651,12 @@ while [ "$i" -lt "$TEST_COUNT" ]; do
 
        TRACE_PATH=$(mktemp -d)
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH >/dev/null 2>&1
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
        # Execute test
        ${TESTS[$i]}
-       if [ $? -ne 0 ]; then
-               stop_lttng_sessiond
-               exit 1
-       fi
 
-       destroy_lttng_session $SESSION_NAME >/dev/null 2>&1
+       destroy_lttng_session_ok $SESSION_NAME
 
        rm -rf $TRACE_PATH