Fix: snapshot path have domain subdir duplicate "ust/ust" or "kernel/kernel"

[lttng-tools.git] / tests / regression / tools / snapshots / test_kernel

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index 15b7ec1762c445a0a2429de2512c3d1d1f9bae49..d4e0008f9be279c860a39303c3d225acea4ea8aa 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -14,7 +14,7 @@ CHANNEL_NAME="snapchan"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=2060
+NUM_TESTS=2061
 
 source $TESTDIR/utils/utils.sh
 
@@ -31,12 +31,11 @@ function test_kernel_local_snapshot ()
        destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test
+       validate_trace_path_kernel_snapshot "$TRACE_PATH" "" "snapshot-1" 0 ""
        validate_trace $EVENT_NAME $TRACE_PATH/
        if [ $? -eq 0 ]; then
                # Only delete if successful
                rm -rf $TRACE_PATH
-       else
-               break
        fi
 }
 
@@ -138,9 +137,9 @@ function test_kernel_local_snapshot_discard ()
        rm -rf $TRACE_PATH
 
        if [ x"$FIRST_LINE" != x"$FIRST_LINE_2" ]; then
-               fail "First snapshot event do not match."
+               fail "First snapshot event do not match"
        else
-               pass "First snapshot event match."
+               pass "First snapshot event match"
        fi
 
        stop_lttng_tracing_ok $SESSION_NAME
@@ -176,9 +175,9 @@ function test_kernel_local_snapshot_overwrite_small_buffers ()
        rm -rf $TRACE_PATH
 
        if [ x"$FIRST_LINE" != x"$FIRST_LINE_2" ]; then
-               pass "First snapshot event do not match."
+               pass "First snapshot event do not match"
        else
-               fail "First snapshot event match."
+               fail "First snapshot event match"
        fi
 
        stop_lttng_tracing_ok $SESSION_NAME
@@ -222,7 +221,7 @@ else
        isroot=0
 fi
 
-skip $isroot "Root access is needed. Skipping all kernel snapshot tests." $NUM_TESTS ||
+skip $isroot "Root access is needed. Skipping all kernel snapshot tests" $NUM_TESTS ||
 {
 
        validate_lttng_modules_present