X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_save;h=2994c9f6c695b6d121be04877b4e00eb76236c48;hb=827caf52170780e09de9184749067ef670801846;hp=1f6bbbd5a64cb61d8164638c6a52cd82363b4201;hpb=e02b109ba0132f2c715fdb9db55cbdf8f8203749;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save
index 1f6bbbd5a..2994c9f6c 100755
--- a/tests/regression/tools/save-load/test_save
+++ b/tests/regression/tools/save-load/test_save
@@ -65,8 +65,8 @@ function test_basic_save()
 {
 	diag "Test basic save"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
 	lttng_save $SESSION_NAME "-o $TRACE_PATH"
@@ -80,13 +80,13 @@ function test_basic_save_all()
 {
 	diag "Test basic save all"
 
-	create_lttng_session $SESSION_NAME-1 $TRACE_PATH
-	create_lttng_session $SESSION_NAME-2 $TRACE_PATH
-	create_lttng_session $SESSION_NAME-3 $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME-3 $TRACE_PATH
 
-	enable_ust_lttng_channel $SESSION_NAME-1 $CHANNEL_NAME
-	enable_ust_lttng_channel $SESSION_NAME-2 $CHANNEL_NAME
-	enable_ust_lttng_channel $SESSION_NAME-3 $CHANNEL_NAME
+	enable_ust_lttng_channel_ok $SESSION_NAME-1 $CHANNEL_NAME
+	enable_ust_lttng_channel_ok $SESSION_NAME-2 $CHANNEL_NAME
+	enable_ust_lttng_channel_ok $SESSION_NAME-3 $CHANNEL_NAME
 
 	enable_ust_lttng_event $SESSION_NAME-1 $EVENT_NAME $CHANNEL_NAME
 	enable_ust_lttng_event $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
@@ -107,8 +107,8 @@ function test_overwrite()
 {
 	diag "Test overwrite session file"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
 	lttng_save $SESSION_NAME "-o $TRACE_PATH"
@@ -118,8 +118,8 @@ function test_overwrite()
 	destroy_lttng_session $SESSION_NAME
 
 	# Create a new session with same name so we can force the overwrite
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
 	# This one MUST fail
@@ -150,7 +150,7 @@ do
 		break;
 	fi
 	# Only delete if successful
-	#rm -rf $TRACE_PATH
+	rm -rf $TRACE_PATH
 done
 
 stop_lttng_sessiond