From: Julien Desfossez <jdesfossez@efficios.com>
Date: Thu, 4 Jul 2013 15:56:47 +0000 (-0400)
Subject: Tests: fix validation trace path in kernel snapshot
X-Git-Tag: v2.3.0-rc1~76
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=78435723057edf81c9adf14336a60c368790c0f6;p=lttng-tools.git

Tests: fix validation trace path in kernel snapshot

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/tests/regression/tools/snapshots/test_kernel b/tests/regression/tools/snapshots/test_kernel
index 6910b0e62..a12f0b8a8 100755
--- a/tests/regression/tools/snapshots/test_kernel
+++ b/tests/regression/tools/snapshots/test_kernel
@@ -48,7 +48,7 @@ function test_kernel_local_snapshot ()
 	destroy_lttng_session $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
@@ -70,7 +70,7 @@ function test_kernel_local_snapshot_after_stop ()
 	destroy_lttng_session $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,8 +81,8 @@ 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
@@ -93,7 +93,7 @@ function test_kernel_local_snapshot_append_to_metadata ()
 
 	# 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
@@ -133,7 +133,7 @@ function test_kernel_1000_local_snapshots ()
 		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