X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_save;h=467722e43b9e2f81e4329fec0a70d101f033f782;hb=67df60e929042ca8a0ab519b9e122d12105d330a;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..467722e43 100755
--- a/tests/regression/tools/save-load/test_save
+++ b/tests/regression/tools/save-load/test_save
@@ -29,7 +29,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=37
+NUM_TESTS=41
 
 source $TESTDIR/utils/utils.sh
 
@@ -65,32 +65,37 @@ function test_basic_save()
 {
 	diag "Test basic save"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	lttng_track_ok "-p 666 -u -s $SESSION_NAME"
 
 	lttng_save $SESSION_NAME "-o $TRACE_PATH"
 
 	is_session_saved $TRACE_PATH $SESSION_NAME
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 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
-	enable_ust_lttng_event $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME-1 $EVENT_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
+
+	lttng_track_ok "-p 666 -u -s $SESSION_NAME-1"
+	lttng_track_ok "-p 666 -u -s $SESSION_NAME-2"
+	lttng_track_ok "-p 666 -u -s $SESSION_NAME-3"
 
 	lttng_save "" "-a -o $TRACE_PATH"
 
@@ -98,29 +103,29 @@ function test_basic_save_all()
 	is_session_saved $TRACE_PATH $SESSION_NAME-2
 	is_session_saved $TRACE_PATH $SESSION_NAME-3
 
-	destroy_lttng_session $SESSION_NAME-1
-	destroy_lttng_session $SESSION_NAME-2
-	destroy_lttng_session $SESSION_NAME-3
+	destroy_lttng_session_ok $SESSION_NAME-1
+	destroy_lttng_session_ok $SESSION_NAME-2
+	destroy_lttng_session_ok $SESSION_NAME-3
 }
 
 function test_overwrite()
 {
 	diag "Test overwrite session file"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
 	lttng_save $SESSION_NAME "-o $TRACE_PATH"
 
 	is_session_saved $TRACE_PATH $SESSION_NAME
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $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
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
 	# This one MUST fail
 	save_lttng_fail $SESSION_NAME "-o $TRACE_PATH"
@@ -130,7 +135,7 @@ function test_overwrite()
 
 	is_session_saved $TRACE_PATH $SESSION_NAME
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond
@@ -150,7 +155,7 @@ do
 		break;
 	fi
 	# Only delete if successful
-	#rm -rf $TRACE_PATH
+	rm -rf $TRACE_PATH
 done
 
 stop_lttng_sessiond