X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Ftest_kernel;h=9dac4596b0ce222bcc72001f8a46e33d65f44cb5;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hp=6910b0e62b8c6469278a033083f20e6c1ed44d20;hpb=07b86b528dc279d59cdf16e6cb946c144fe773f2;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index 6910b0e62..9dac4596b 100755
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -41,14 +41,14 @@ function test_kernel_local_snapshot ()
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 	lttng_snapshot_record $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
-	validate_trace $EVENT_NAME $TRACE_PATH/snapshot/
+	validate_trace $EVENT_NAME $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
@@ -63,14 +63,14 @@ function test_kernel_local_snapshot_after_stop ()
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
-	stop_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 	lttng_snapshot_record $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test
-	validate_trace $EVENT_NAME $TRACE_PATH/snapshot/
+	validate_trace $EVENT_NAME $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
@@ -81,19 +81,19 @@ function test_kernel_local_snapshot_after_stop ()
 
 function test_kernel_local_snapshot_append_to_metadata ()
 {
-	EVENT1=sched_switch
-	EVENT2=sched_process_exec
+	local EVENT1=sched_switch
+	local EVENT2=sched_process_exit
 
 	diag "Test local kernel snapshots with one event $EVENT1"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT1 $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 
 	# first snapshot with only 1 event
 	lttng_snapshot_record $SESSION_NAME
-	validate_trace $EVENT_NAME $TRACE_PATH/snapshot/
+	validate_trace $EVENT_NAME $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
@@ -106,7 +106,7 @@ function test_kernel_local_snapshot_append_to_metadata ()
 	lttng_enable_kernel_event $SESSION_NAME $EVENT2 $CHANNEL_NAME
 	rm -rf $TRACE_PATH/snapshot/* 2>/dev/null
 	lttng_snapshot_record $SESSION_NAME
-	validate_trace "${EVENT1},${EVENT2}" $TRACE_PATH/snapshot/
+	validate_trace "${EVENT1},${EVENT2}" $TRACE_PATH/
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
@@ -114,8 +114,8 @@ function test_kernel_local_snapshot_append_to_metadata ()
 		break
 	fi
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_kernel_1000_local_snapshots ()
@@ -126,14 +126,14 @@ function test_kernel_1000_local_snapshots ()
 	create_lttng_session_no_output $SESSION_NAME
 	enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 	lttng_snapshot_add_output $SESSION_NAME $TRACE_PATH
 	for i in $(seq 1 $NB_SNAP); do
 		diag "Snapshot $i/$NB_SNAP"
 		rm -rf $TRACE_PATH/snapshot/* 2>/dev/null
 		lttng_snapshot_record $SESSION_NAME
 		# Validate test
-		validate_trace $EVENT_NAME $TRACE_PATH/snapshot/
+		validate_trace $EVENT_NAME $TRACE_PATH/
 		if [ $? -eq 0 ]; then
 			# Only delete if successful
 			rm -rf $TRACE_PATH
@@ -141,8 +141,8 @@ function test_kernel_1000_local_snapshots ()
 			break
 		fi
 	done
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 plan_tests $NUM_TESTS