build-sys: convert tests/ to module

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

1 files changed, 51 insertions, 57 deletions

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 2b2a5771e..002c2c01e 100644
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -6,69 +6,63 @@ top_srcdir=@abs_top_srcdir@
 TS_TESTUSER=${TS_TESTUSER:-"test"}
 
 # helpers
-TS_HELPER_SYSINFO="$top_builddir/tests/helpers/test_sysinfo"
-TS_HELPER_PATHS="$top_builddir/tests/helpers/test_pathnames"
-TS_HELPER_BYTESWAP="$top_builddir/tests/helpers/test_byteswap"
-TS_HELPER_MD5="$top_builddir/tests/helpers/test_md5"
+TS_HELPER_SYSINFO="$top_builddir/test_sysinfo"
+TS_HELPER_PATHS="$top_builddir/test_pathnames"
+TS_HELPER_BYTESWAP="$top_builddir/test_byteswap"
+TS_HELPER_MD5="$top_builddir/test_md5"
 
-TS_HELPER_ISMOUNTED="$top_builddir/lib/test_ismounted"
-TS_HELPER_STRUTILS="$top_builddir/lib/test_strutils"
-TS_HELPER_CPUSET="$top_builddir/lib/test_cpuset"
+TS_HELPER_ISMOUNTED="$top_builddir/test_ismounted"
+TS_HELPER_STRUTILS="$top_builddir/test_strutils"
+TS_HELPER_CPUSET="$top_builddir/test_cpuset"
 
 # libmount
-TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/libmount/src/test_optstr"
-TS_HELPER_LIBMOUNT_TAB="$top_builddir/libmount/src/test_tab"
-TS_HELPER_LIBMOUNT_UTILS="$top_builddir/libmount/src/test_utils"
-TS_HELPER_LIBMOUNT_LOCK="$top_builddir/libmount/src/test_lock"
-TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/libmount/src/test_tab_update"
-TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/libmount/src/test_context"
-TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/libmount/src/test_tab_diff"
+TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/test_optstr"
+TS_HELPER_LIBMOUNT_TAB="$top_builddir/test_tab"
+TS_HELPER_LIBMOUNT_UTILS="$top_builddir/test_utils"
+TS_HELPER_LIBMOUNT_LOCK="$top_builddir/test_lock"
+TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/test_tab_update"
+TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/test_context"
+TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/test_tab_diff"
 
-TS_HELPER_ISLOCAL="$top_builddir/login-utils/test_islocal"
-TS_HELPER_LOGINDEFS="$top_builddir/login-utils/test_logindefs"
+TS_HELPER_ISLOCAL="$top_builddir/test_islocal"
+TS_HELPER_LOGINDEFS="$top_builddir/test_logindefs"
 
 # TODO: use partx
-TS_HELPER_PARTITIONS="$top_builddir/libblkid/samples/partitions"
+TS_HELPER_PARTITIONS="$top_builddir/samples-partitions"
 
 # paths to commands
-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/swapon"}
-TS_CMD_SWAPOFF=${TS_CMD_SWAPOFF:-"$top_builddir/sys-utils/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"}
-TS_CMD_MKMINIX=${TS_CMD_MKMINIX:-"$top_builddir/disk-utils/mkfs.minix"}
-TS_CMD_FSCKCRAMFS=${TS_CMD_FSCKCRAMFS:-"$top_builddir/disk-utils/fsck.cramfs"}
-TS_CMD_FSCKMINIX=${TS_CMD_FSCKMINIX:-"$top_builddir/disk-utils/fsck.minix"}
-
-TS_CMD_IPCS=${TS_CMD_IPCS:-"$top_builddir/sys-utils/ipcs"}
-
-TS_CMD_COL=${TS_CMD_COL:-"$top_builddir/text-utils/col"}
-TS_CMD_COLUMN=${TS_CMD_COLUMN:-"$top_builddir/text-utils/column"}
-TS_CMD_COLRM=${TS_CMD_COLRM:-"$top_builddir/text-utils/colrm"}
-
-TS_CMD_NAMEI=${TS_CMD_NAMEI-"$top_builddir/misc-utils/namei"}
-TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/misc-utils/look"}
-TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/misc-utils/cal"}
-TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/term-utils/script"}
-TS_CMD_EJECT=${TS_CMD_EJECT-"$top_builddir/sys-utils/eject"}
-
-
-TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$top_builddir/hwclock/hwclock"}
-TS_CMD_LSCPU=${TS_CMD_LSCPU-"$top_builddir/sys-utils/lscpu"}
-
-TS_CMD_BLKID=${TS_CMD_BLKID-"$top_builddir/misc-utils/blkid"}
-TS_CMD_PARTX=${TS_CMD_PARTX-"$top_builddir/partx/partx"}
-TS_CMD_FINDMNT=${TS_CMD_FINDMNT-"$top_builddir/misc-utils/findmnt"}
-
-TS_CMD_FDISK=${TS_CMD_FDISK-"$top_builddir/fdisk/fdisk"}
+TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount"}
+TS_CMD_UMOUNT=${TS_CMD_UMOUNT:-"$top_builddir/umount"}
+
+TS_CMD_SWAPON=${TS_CMD_SWAPON:-"$top_builddir/swapon"}
+TS_CMD_SWAPOFF=${TS_CMD_SWAPOFF:-"$top_builddir/swapoff"}
+TS_CMD_LOSETUP=${TS_CMD_LOSETUP:-"$top_builddir/losetup"}
+
+TS_CMD_MKSWAP=${TS_CMD_MKSWAP:-"$top_builddir/mkswap"}
+TS_CMD_MKCRAMFS=${TS_CMD_MKCRAMFS:-"$top_builddir/mkfs.cramfs"}
+TS_CMD_MKMINIX=${TS_CMD_MKMINIX:-"$top_builddir/mkfs.minix"}
+TS_CMD_FSCKCRAMFS=${TS_CMD_FSCKCRAMFS:-"$top_builddir/fsck.cramfs"}
+TS_CMD_FSCKMINIX=${TS_CMD_FSCKMINIX:-"$top_builddir/fsck.minix"}
+
+TS_CMD_IPCS=${TS_CMD_IPCS:-"$top_builddir/ipcs"}
+
+TS_CMD_COL=${TS_CMD_COL:-"$top_builddir/col"}
+TS_CMD_COLUMN=${TS_CMD_COLUMN:-"$top_builddir/column"}
+TS_CMD_COLRM=${TS_CMD_COLRM:-"$top_builddir/colrm"}
+
+TS_CMD_NAMEI=${TS_CMD_NAMEI-"$top_builddir/namei"}
+TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/look"}
+TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/cal"}
+TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/script"}
+TS_CMD_EJECT=${TS_CMD_EJECT-"$top_builddir/eject"}
+
+
+TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$top_builddir/hwclock"}
+TS_CMD_LSCPU=${TS_CMD_LSCPU-"$top_builddir/lscpu"}
+
+TS_CMD_BLKID=${TS_CMD_BLKID-"$top_builddir/blkid"}
+TS_CMD_PARTX=${TS_CMD_PARTX-"$top_builddir/partx"}
+TS_CMD_FINDMNT=${TS_CMD_FINDMNT-"$top_builddir/findmnt"}
+
+TS_CMD_FDISK=${TS_CMD_FDISK-"$top_builddir/fdisk"}