X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_save;h=0f3e596a0aa5501db90c3b0e17620dc039bbf6e9;hb=7f4d5b07cf7be895b38b69073389a4fcc318ec29;hp=abb2c5684e9ea08cb65ec11a24f09a51ef58e42a;hpb=bf6ae429bc7bf2fefdce61e48806768dab7567d5;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save
index abb2c5684..0f3e596a0 100755
--- a/tests/regression/tools/save-load/test_save
+++ b/tests/regression/tools/save-load/test_save
@@ -1,27 +1,13 @@
 #!/bin/bash
 #
-# Copyright (C) - 2014 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2014 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
 
 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 +15,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=37
+NUM_TESTS=41
 
 source $TESTDIR/utils/utils.sh
 
@@ -66,14 +52,15 @@ function test_basic_save()
 	diag "Test basic save"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	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()
@@ -84,13 +71,17 @@ function test_basic_save_all()
 	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_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
 
-	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
+	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,9 +89,9 @@ 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()
@@ -108,19 +99,19 @@ function test_overwrite()
 	diag "Test overwrite session file"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	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_ok $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+	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 +121,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