X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_kernel;h=c99802d547af98545821e37f2d3bf1dc4d5bcc80;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=24b0ad4a2b6f43dc222cf42c6607807713718f50;hpb=ce83431da09a14449027ef7b2ef9d3f7f82ea674;p=lttng-tools.git diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel index 24b0ad4a2..c99802d54 100755 --- a/tests/regression/tools/snapshots/test_kernel +++ b/tests/regression/tools/snapshots/test_kernel @@ -12,9 +12,9 @@ EVENT_NAME="sched_switch" SESSION_NAME="" CHANNEL_NAME="snapchan" -TRACE_PATH=$(mktemp -d) +TRACE_PATH=$(mktemp --tmpdir -d tmp.test_snapshots_kernel_trace_path.XXXXXX) -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 } @@ -216,6 +215,9 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +bail_out_if_no_babeltrace + + if [ "$(id -u)" == "0" ]; then isroot=1 else