tests: cleanup ts/login

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/login/checktty b/tests/ts/login/checktty
index a5a132799263550354e37826a3f093d1d6e124a1..d19fb023be9c50602bdab8d6a918c80d45c129f1 100755 (executable)
--- a/tests/ts/login/checktty
+++ b/tests/ts/login/checktty
@@ -15,13 +15,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="login"
+TS_TOPDIR="$(dirname $0)/../.."
 TS_DESC="checktty"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
+
 $TS_CMD_CHECKTTY  >> $TS_OUTPUT
 ts_finalize
 

diff --git a/tests/ts/login/islocal b/tests/ts/login/islocal
index acffb07735c3b13216aefebf6738bea595d6f611..0534f7ef011807004217e50159aa1ee1134799ed 100755 (executable)
--- a/tests/ts/login/islocal
+++ b/tests/ts/login/islocal
@@ -15,13 +15,12 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="login"
+TS_TOPDIR="$(dirname $0)/../.."
 TS_DESC="islocal"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
+
 $TS_CMD_ISLOCAL "$TS_SELF/islocal.data" root nobody "" youngman youngman2 \
     abcdefghx nobo long rot al malformed \
     nonl znobody >> $TS_OUTPUT