Clean-up: modernize pretty_xml.cpp

[lttng-tools.git] / tests / regression / tools / notification / test_notification_notifier_discarded_count

diff --git a/tests/regression/tools/notification/test_notification_notifier_discarded_count b/tests/regression/tools/notification/test_notification_notifier_discarded_count
index fa7ad1e40ff680163997a003ffe7966a508e6bbe..25ef370fad0641bafee60a64b56fd3f33c627253 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_notifier_discarded_count
+++ b/tests/regression/tools/notification/test_notification_notifier_discarded_count
@@ -7,14 +7,17 @@
 CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../../../
 
-TEST_TMPDIR=$(mktemp --tmpdir -d tmp.test_notifier_discarded_count.XXXXXX)
+TEST_TMPDIR=$(mktemp -d -t tmp.test_notifier_discarded_count.XXXXXX)
+
+# Set TMPDIR for further call to mktemp
+export TMPDIR="$TEST_TMPDIR"
 
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 
 TESTPOINT_BASE_PATH=$(readlink -f "$TEST_TMPDIR/lttng.t_p_n")
-TESTPOINT_PIPE_PATH=$(mktemp -u --tmpdir="$TEST_TMPDIR" "lttng.t_p_n.XXXXXX")
+TESTPOINT_PIPE_PATH=$(mktemp -u -t "lttng.t_p_n.XXXXXX")
 TESTPOINT=$(readlink -f "${CURDIR}/.libs/libpause_sessiond.so")
 
 SH_TAP=1
@@ -37,17 +40,17 @@ plan_tests $NUM_TESTS
 function trigger_get_discarded_notif_number()
 {
        local trigger_name="$1"
-       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
+       local list_triggers_stdout=$(mktemp -t "list_triggers_stdout.XXXXXX")
 
        "$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
 
-       cat "$list_triggers_stdout" | grep -a7 "$trigger_name" | tail -1 | grep --quiet "errors: none"
+       cat "$list_triggers_stdout" | grep -A7 "$trigger_name" | grep -A2 "event rule matches" | tail -1 | grep --quiet "errors: none"
        ret=$?
 
        if [ "$ret" -eq "0" ]; then
                notif_nb="0"
        else
-               notif_nb=$(cat "$list_triggers_stdout" | grep -a8 "$trigger_name" | tail -1 | grep "discarded tracer messages" | cut -d' ' -f8)
+               notif_nb=$(cat "$list_triggers_stdout" | grep -A7 "$trigger_name" | grep "discarded tracer messages" | cut -d' ' -f10)
        fi
 
        rm -f "$list_triggers_stdout"
@@ -60,7 +63,7 @@ function test_kernel_notifier_discarded_count
 {
        local sessiond_pipe=()
        local trigger_name="my_trigger"
-       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
+       local list_triggers_stdout=$(mktemp -t "list_triggers_stdout.XXXXXX")
 
        # Used on sessiond launch.
        LTTNG_SESSIOND_ENV_VARS="LTTNG_TESTPOINT_ENABLE=1 \
@@ -244,7 +247,7 @@ function test_ust_notifier_discarded_count_multi_uid
        local sessiond_pipe=()
        local root_trigger_name="root_trigger"
        local user_trigger_name="user_trigger"
-       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
+       local list_triggers_stdout=$(mktemp -t "list_triggers_stdout.XXXXXX")
        local NR_USEC_WAIT=0
        local PIPE_SIZE
        local NR_ITER
@@ -324,7 +327,7 @@ function test_ust_notifier_discarded_regardless_trigger_owner
        local sessiond_pipe=()
        local root_trigger_name="root_trigger"
        local user_trigger_name="user_trigger"
-       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
+       local list_triggers_stdout=$(mktemp -t "list_triggers_stdout.XXXXXX")
        local NR_USEC_WAIT=0
        local PIPE_SIZE
        local NR_ITER
@@ -391,7 +394,8 @@ function test_ust_notifier_discarded_regardless_trigger_owner
 test_ust_notifier_discarded_count
 test_ust_notifier_discarded_count_max_bucket
 
-if [ "$(id -u)" == "0" ]; then
+check_skip_kernel_test "$KERNEL_NUM_TESTS" "Skipping kernel notification tests." ||
+{
 
        validate_lttng_modules_present
 
@@ -413,9 +417,7 @@ if [ "$(id -u)" == "0" ]; then
        modprobe --remove lttng-test
 
        rm -rf "${sessiond_pipe[@]}" 2> /dev/null
-else
-       # Kernel tests are skipped.
-       skip 0 "Root access is needed. Skipping all kernel notification tests." $KERNEL_NUM_TESTS
-fi
 
-rm -f "$TEST_TMPDIR"
+}
+
+rm -rf "$TEST_TMPDIR"