From: Karel Zak <kzak@redhat.com>
Date: Thu, 12 Jan 2012 10:15:53 +0000 (+0100)
Subject: tests: cleanup paths
X-Git-Tag: v2.21-rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcaa1ffb77bbd9ceede9ac5c5c5295903e73a061;p=thirdparty%2Futil-linux.git

tests: cleanup paths

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

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 4695e8a664..1ce112a525 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -33,13 +33,18 @@ TS_HELPER_PARTITIONS="$top_builddir/libblkid/samples/partitions"
 U_L_LIBRARY_PATH="$top_builddir/libblkid/src/.libs:$top_builddir/libuuid/src/.libs"
 
 # paths to commands
-TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount/mount"}
-TS_CMD_UMOUNT=${TS_CMD_UMOUNT:-"$top_builddir/mount/umount"}
-TS_CMD_SWAPON=${TS_CMD_SWAPON:-"$top_builddir/mount/.libs/swapon"}
-TS_CMD_SWAPOFF=${TS_CMD_SWAPOFF:-"$top_builddir/mount/.libs/swapoff"}
-TS_CMD_LOSETUP=${TS_CMD_LOSETUP:-"$top_builddir/mount/losetup"}
-
-TS_CMD_MTABLOCK=${TS_CMD_MTABLOCK:-"$top_builddir/mount/mtab_lock_test"}
+if [ -x "$top_builddir/sys-utils/mount" ]; then
+ TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/sys-utils/mount"}
+ TS_CMD_UMOUNT=${TS_CMD_UMOUNT:-"$top_builddir/sys-utils/umount"}
+else
+ TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount/mount"}
+ TS_CMD_UMOUNT=${TS_CMD_UMOUNT:-"$top_builddir/mount/umount"}
+ TS_CMD_MTABLOCK=${TS_CMD_MTABLOCK:-"$top_builddir/mount/mtab_lock_test"}
+fi
+
+TS_CMD_SWAPON=${TS_CMD_SWAPON:-"$top_builddir/sys-utils/.libs/swapon"}
+TS_CMD_SWAPOFF=${TS_CMD_SWAPOFF:-"$top_builddir/sys-utils/.libs/swapoff"}
+TS_CMD_LOSETUP=${TS_CMD_LOSETUP:-"$top_builddir/sys-utils/losetup"}
 
 TS_CMD_MKSWAP=${TS_CMD_MKSWAP:-"$top_builddir/disk-utils/mkswap"}
 TS_CMD_MKCRAMFS=${TS_CMD_MKCRAMFS:-"$top_builddir/disk-utils/mkfs.cramfs"}