From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 5 Jan 2015 02:25:07 +0000 (-0500)
Subject: Fix: ust snapshot: cleanup after error
X-Git-Tag: v2.6.0~30
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6b506e8dcb1aaccb351638faf0dfcf7e86405b54;p=lttng-tools.git

Fix: ust snapshot: cleanup after error

The "break" statement on error skips the rest of the functions, thus
leaving test applications running after the end of the test, which is a
side-effect on the following tests.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index e727aa634..128849ef8 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -168,8 +168,6 @@ function test_ust_local_snapshot ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 
 	kill_test_app
@@ -247,8 +245,6 @@ function test_ust_local_snapshot_large_metadata ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 }
 
@@ -282,8 +278,6 @@ function test_ust_per_uid_local_snapshot ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 
 	kill_test_app
@@ -311,8 +305,6 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 	if [ $? -eq 0 ]; then
 		# Only delete if successful
 		rm -rf $TRACE_PATH
-	else
-		break
 	fi
 }
 
@@ -337,8 +329,6 @@ function test_ust_local_snapshots ()
 		if [ $? -eq 0 ]; then
 			# Only delete if successful
 			rm -rf $TRACE_PATH
-		else
-			break
 		fi
 	done
 	stop_lttng_tracing $SESSION_NAME