From 5695d6a67e7499abb3fd4118c4197e2ae95cb6bb Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 19 Jan 2013 00:09:11 +0000 Subject: tests: sort commands strings The list is starting to be long enough that making any order to it seems like right thing to do. Signed-off-by: Sami Kerola --- tests/commands.sh | 105 ++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 62 deletions(-) (limited to 'tests/commands.sh') diff --git a/tests/commands.sh b/tests/commands.sh index 8623e65fc..a2948c911 100644 --- a/tests/commands.sh +++ b/tests/commands.sh @@ -2,84 +2,65 @@ TS_TESTUSER=${TS_TESTUSER:-"test"} # helpers -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/test_ismounted" -TS_HELPER_STRUTILS="$top_builddir/test_strutils" TS_HELPER_CPUSET="$top_builddir/test_cpuset" - -# libmount +TS_HELPER_ISLOCAL="$top_builddir/test_islocal" +TS_HELPER_ISMOUNTED="$top_builddir/test_ismounted" +TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/test_mount_context" +TS_HELPER_LIBMOUNT_LOCK="$top_builddir/test_mount_lock" TS_HELPER_LIBMOUNT_OPTSTR="$top_builddir/test_mount_optstr" +TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/test_mount_tab_diff" TS_HELPER_LIBMOUNT_TAB="$top_builddir/test_mount_tab" -TS_HELPER_LIBMOUNT_UTILS="$top_builddir/test_mount_utils" -TS_HELPER_LIBMOUNT_LOCK="$top_builddir/test_mount_lock" TS_HELPER_LIBMOUNT_UPDATE="$top_builddir/test_mount_tab_update" -TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/test_mount_context" -TS_HELPER_LIBMOUNT_TABDIFF="$top_builddir/test_mount_tab_diff" - -TS_HELPER_ISLOCAL="$top_builddir/test_islocal" +TS_HELPER_LIBMOUNT_UTILS="$top_builddir/test_mount_utils" TS_HELPER_LOGINDEFS="$top_builddir/test_logindefs" - +TS_HELPER_MD5="$top_builddir/test_md5" TS_HELPER_MORE=${TS_HELPER_MORE-"$top_builddir/test_more"} - -# TODO: use partx TS_HELPER_PARTITIONS="$top_builddir/sample-partitions" +TS_HELPER_PATHS="$top_builddir/test_pathnames" +TS_HELPER_STRUTILS="$top_builddir/test_strutils" +TS_HELPER_SYSINFO="$top_builddir/test_sysinfo" # paths to commands -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/test_fsck.cramfs"} -TS_CMD_FSCKMINIX=${TS_CMD_FSCKMINIX:-"$top_builddir/fsck.minix"} - -TS_CMD_IPCS=${TS_CMD_IPCS:-"$top_builddir/ipcs"} - +TS_CMD_BLKID=${TS_CMD_BLKID-"$top_builddir/blkid"} +TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/cal"} +TS_CMD_COLRM=${TS_CMD_COLRM:-"$top_builddir/colrm"} 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_REV=${TS_CMD_REV:-"$top_builddir/rev"} - -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_DMESG=${TS_CMD_DMESG-"$top_builddir/dmesg"} 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_FALLOCATE=${TS_CMD_FALLOCATE-"$top_builddir/fallocate"} TS_CMD_FDISK=${TS_CMD_FDISK-"$top_builddir/fdisk"} - -TS_CMD_HEXDUMP=${TS_CMD_HEXDUMP-"$top_builddir/hexdump"} - -TS_CMD_UTMPDUMP=${TS_CMD_UTMPDUMP-"$top_builddir/utmpdump"} +TS_CMD_FINDMNT=${TS_CMD_FINDMNT-"$top_builddir/findmnt"} +TS_CMD_FSCKCRAMFS=${TS_CMD_FSCKCRAMFS:-"$top_builddir/test_fsck.cramfs"} +TS_CMD_FSCKMINIX=${TS_CMD_FSCKMINIX:-"$top_builddir/fsck.minix"} TS_CMD_GETOPT=${TS_CMD_GETOPT-"$top_builddir/getopt"} -TS_CMD_MCOOKIE=${TS_CMD_MCOOKIE-"$top_builddir/mcookie"} -TS_CMD_TAILF=${TS_CMD_TAILF-"$top_builddir/tailf"} -TS_CMD_UL=${TS_CMD_UL-"$top_builddir/ul"} +TS_CMD_HEXDUMP=${TS_CMD_HEXDUMP-"$top_builddir/hexdump"} +TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$top_builddir/hwclock"} TS_CMD_IONICE=${TS_CMD_IONICE-"$top_builddir/ionice"} - +TS_CMD_IPCMK=${TS_CMD_IPCMK-"$top_builddir/ipcmk"} +TS_CMD_IPCRM=${TS_CMD_IPCRM-"$top_builddir/ipcrm"} +TS_CMD_IPCS=${TS_CMD_IPCS:-"$top_builddir/ipcs"} +TS_CMD_ISOSIZE=${TS_CMD_ISOSIZE-"$top_builddir/isosize"} TS_CMD_LINE=${TS_CMD_LINE-"$top_builddir/line"} -TS_CMD_DMESG=${TS_CMD_DMESG-"$top_builddir/dmesg"} -TS_CMD_SETSID=${TS_CMD_SETSID-"$top_builddir/setsid"} +TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/look"} +TS_CMD_LOSETUP=${TS_CMD_LOSETUP:-"$top_builddir/losetup"} +TS_CMD_LSCPU=${TS_CMD_LSCPU-"$top_builddir/lscpu"} +TS_CMD_MCOOKIE=${TS_CMD_MCOOKIE-"$top_builddir/mcookie"} +TS_CMD_MKCRAMFS=${TS_CMD_MKCRAMFS:-"$top_builddir/mkfs.cramfs"} +TS_CMD_MKMINIX=${TS_CMD_MKMINIX:-"$top_builddir/mkfs.minix"} +TS_CMD_MKSWAP=${TS_CMD_MKSWAP:-"$top_builddir/mkswap"} +TS_CMD_MOUNT=${TS_CMD_MOUNT:-"$top_builddir/mount"} +TS_CMD_NAMEI=${TS_CMD_NAMEI-"$top_builddir/namei"} +TS_CMD_PARTX=${TS_CMD_PARTX-"$top_builddir/partx"} +TS_CMD_REV=${TS_CMD_REV:-"$top_builddir/rev"} +TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/script"} TS_CMD_SETARCH=${TS_CMD_SETARCH-"$top_builddir/setarch"} -TS_CMD_FALLOCATE=${TS_CMD_FALLOCATE-"$top_builddir/fallocate"} -TS_CMD_ISOSIZE=${TS_CMD_ISOSIZE-"$top_builddir/isosize"} +TS_CMD_SETSID=${TS_CMD_SETSID-"$top_builddir/setsid"} +TS_CMD_SWAPOFF=${TS_CMD_SWAPOFF:-"$top_builddir/swapoff"} +TS_CMD_SWAPON=${TS_CMD_SWAPON:-"$top_builddir/swapon"} +TS_CMD_TAILF=${TS_CMD_TAILF-"$top_builddir/tailf"} +TS_CMD_UL=${TS_CMD_UL-"$top_builddir/ul"} +TS_CMD_UMOUNT=${TS_CMD_UMOUNT:-"$top_builddir/umount"} +TS_CMD_UTMPDUMP=${TS_CMD_UTMPDUMP-"$top_builddir/utmpdump"} TS_CMD_WHEREIS=${TS_CMD_WHEREIS-"$top_builddir/whereis"} -TS_CMD_IPCMK=${TS_CMD_IPCMK-"$top_builddir/ipcmk"} -TS_CMD_IPCRM=${TS_CMD_IPCRM-"$top_builddir/ipcrm"} -- cgit v1.2.3-55-g7522