X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_save;h=c5f6b1341c4afeb7b019919e732809ed4bb0d727;hp=299776fba121b29d9466d6105f8fd490aaed7c6d;hb=4d513dce5d26cbc477a00b348beb537d01231cd9;hpb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73

diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save
index 299776fba..c5f6b1341 100755
--- a/tests/regression/tools/save-load/test_save
+++ b/tests/regression/tools/save-load/test_save
@@ -19,9 +19,6 @@ TEST_DESC="Save session(s)"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
 
 SESSION_NAME="save-42"
 CHANNEL_NAME="chan-save"
@@ -29,7 +26,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=37
+NUM_TESTS=41
 
 source $TESTDIR/utils/utils.sh
 
@@ -68,12 +65,13 @@ function test_basic_save()
 	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()
@@ -92,15 +90,19 @@ function test_basic_save_all()
 	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"
 
 	is_session_saved $TRACE_PATH $SESSION_NAME-1
 	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()
@@ -115,7 +117,7 @@ function test_overwrite()
 
 	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_ok $SESSION_NAME $TRACE_PATH
@@ -130,7 +132,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