X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsave-load%2Ftest_autoload;h=df3fbf153a402faa44020d5d2a22f70e3ab3d64e;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=35b5d7bd50629ef96a5a2bae4dafd25564e3e755;hpb=ff86d8d0bd96d3660ad79aa6158fbeb9055652b2;p=lttng-tools.git

diff --git a/tests/regression/tools/save-load/test_autoload b/tests/regression/tools/save-load/test_autoload
index 35b5d7bd5..df3fbf153 100755
--- a/tests/regression/tools/save-load/test_autoload
+++ b/tests/regression/tools/save-load/test_autoload
@@ -1,29 +1,15 @@
 #!/bin/bash
 #
-# Copyright (C) - 2018 Anders Wallin <wallinux@gmail.com>
+# Copyright (C) 2018 Anders Wallin <wallinux@gmail.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="Auto load session(s)"
 
 CURDIR=$(dirname $0)/
 CONFIG_DIR="${CURDIR}/configuration"
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
-export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
+export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/)
 
 DIR=$(readlink -f $TESTDIR)
 
@@ -41,7 +27,7 @@ function test_auto_load_file()
 	diag "Test auto load file"
 
 	start_lttng_sessiond $CURDIR/load-42.lttng
-	list_lttng_with_opts load-42
+	list_lttng_ok load-42
 	stop_lttng_sessiond
 }
 
@@ -52,7 +38,7 @@ function test_auto_load_dir()
 	cp -f $CURDIR/load-42.lttng $LTTNG_DIR/
 
 	start_lttng_sessiond $LTTNG_DIR
-	list_lttng_with_opts load-42
+	list_lttng_ok load-42
 	stop_lttng_sessiond
 }
 
@@ -64,7 +50,7 @@ function test_auto_load_lttng_home()
 	cp -f $CURDIR/load-42.lttng $LTTNG_HOME/.lttng/sessions/auto
 
 	start_lttng_sessiond
-	list_lttng_with_opts load-42
+	list_lttng_ok load-42
 	stop_lttng_sessiond
 }
 
@@ -76,8 +62,8 @@ TESTS=(
 
 for fct_test in ${TESTS[@]};
 do
-	export LTTNG_HOME=$(mktemp -d)
-	export LTTNG_DIR=$(mktemp -d)
+	export LTTNG_HOME=$(mktemp -d -t tmp.test_lttng_home_dir.XXXXXX)
+	export LTTNG_DIR=$(mktemp -d -t tmp.test_lttng_dir.XXXXXX)
 
 	${fct_test}
 	rm -rf $LTTNG_DIR