X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_kernel;h=870c437b217fc2ed0eb339628fff428e220312fd;hb=2a05e025c52eda43f8ebafdbe6f47dc0e80efa77;hp=d77ed220adb6cd289557b98d9f7916168b637336;hpb=0cb9c4730e7ca14338dee89e39fcb9c49a588ca5;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index d77ed220a..870c437b2 100755
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -12,7 +12,7 @@ EVENT_NAME="sched_switch"
 SESSION_NAME=""
 CHANNEL_NAME="snapchan"
 
-TRACE_PATH=$(mktemp --tmpdir -d tmp.test_snapshots_kernel_trace_path.XXXXXX)
+TRACE_PATH=$(mktemp -d -t tmp.test_snapshots_kernel_trace_path.XXXXXX)
 
 NUM_TESTS=2061
 
@@ -56,8 +56,6 @@ function test_kernel_local_snapshot_after_stop ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 }
 
@@ -79,8 +77,6 @@ function test_kernel_local_snapshot_append_to_metadata ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 
 	diag "Adding event $EVENT2"
@@ -92,8 +88,6 @@ function test_kernel_local_snapshot_append_to_metadata ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 
 	stop_lttng_tracing_ok $SESSION_NAME
@@ -102,8 +96,8 @@ function test_kernel_local_snapshot_append_to_metadata ()
 
 function generate_filter_events_cpu0()
 {
-	# Generate many events (fill buffers) on CPU 0
-	taskset 0x00000001 /bin/echo -n "$1" > /proc/lttng-test-filter-event 2> /dev/null
+	# Generate many events (fill buffers) on a single CPU
+	taskset --cpu-list "$(get_any_available_cpu)" /bin/echo -n "$1" > /proc/lttng-test-filter-event 2> /dev/null
 }
 
 function test_kernel_local_snapshot_discard ()
@@ -129,6 +123,7 @@ function test_kernel_local_snapshot_discard ()
 
 	rm -rf $TRACE_PATH
 
+	# Fill CPU 0's buffer and overwrite previous contents
 	generate_filter_events_cpu0 10000
 
 	# Take 2nd snapshot, compare first line. In discard mode, they
@@ -172,6 +167,7 @@ function test_kernel_local_snapshot_overwrite_small_buffers ()
 
 	rm -rf $TRACE_PATH
 
+	# Fill CPU 0's buffer and overwrite previous contents
 	generate_filter_events_cpu0 10000
 
 	# Take 2nd snapshot, compare first line. In overwrite mode, they