Merge branch 'scols_print_to_string' of https://github.com/ignatenkobrain/util-linux

diff --git a/Makefile.am b/Makefile.am
index 391de3dfb136a992197ec793ff2a90f9f55c18e8..758c4f2859e192a6ab62a72b30c3a30fef88c9cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,6 @@ systemdsystemunit_DATA =
 dist_bashcompletion_DATA =
 check_PROGRAMS =
 dist_check_SCRIPTS =
-TESTS =
 
 PATHFILES =
 

diff --git a/include/c.h b/include/c.h
index 2a317eb52f791977e8f61b4d512947a39576d4a3..ca028baeeeab2c474f3eebb02e26f926ca20b65e 100644 (file)
--- a/include/c.h
+++ b/include/c.h
@@ -346,4 +346,13 @@ static inline int xusleep(useconds_t usec)
 # define UL_ASAN_BLACKLIST     /* nothing */
 #endif
 
+
+
+/*
+ * Note that sysconf(_SC_GETPW_R_SIZE_MAX) returns *initial* suggested size for
+ * pwd buffer and in some cases it is not large enough. See POSIX and
+ * getpwnam_r man page for more details.
+ */
+#define UL_GETPW_BUFSIZ        (16 * 1024)
+
 #endif /* UTIL_LINUX_C_H */

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index e57eb33ba30a8fff2cf9d256a27e92ef24431d6b..39f6c851e4c2925b27cc3324e6e44b468291fc84 100644 (file)
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -635,16 +635,6 @@ int mnt_get_filesystems(char ***filesystems, const char *pattern)
        return rc;
 }
 
-static size_t get_pw_record_size(void)
-{
-#ifdef _SC_GETPW_R_SIZE_MAX
-       long sz = sysconf(_SC_GETPW_R_SIZE_MAX);
-       if (sz > 0)
-               return sz;
-#endif
-       return 16384;
-}
-
 /*
  * Returns an allocated string with username or NULL.
  */
@@ -652,14 +642,13 @@ char *mnt_get_username(const uid_t uid)
 {
         struct passwd pwd;
        struct passwd *res;
-       size_t sz = get_pw_record_size();
        char *buf, *username = NULL;
 
-       buf = malloc(sz);
+       buf = malloc(UL_GETPW_BUFSIZ);
        if (!buf)
                return NULL;
 
-       if (!getpwuid_r(uid, &pwd, buf, sz, &res) && res)
+       if (!getpwuid_r(uid, &pwd, buf, UL_GETPW_BUFSIZ, &res) && res)
                username = strdup(pwd.pw_name);
 
        free(buf);
@@ -671,17 +660,16 @@ int mnt_get_uid(const char *username, uid_t *uid)
        int rc = -1;
         struct passwd pwd;
        struct passwd *pw;
-       size_t sz = get_pw_record_size();
        char *buf;
 
        if (!username || !uid)
                return -EINVAL;
 
-       buf = malloc(sz);
+       buf = malloc(UL_GETPW_BUFSIZ);
        if (!buf)
                return -ENOMEM;
 
-       if (!getpwnam_r(username, &pwd, buf, sz, &pw) && pw) {
+       if (!getpwnam_r(username, &pwd, buf, UL_GETPW_BUFSIZ, &pw) && pw) {
                *uid= pw->pw_uid;
                rc = 0;
        } else {
@@ -699,17 +687,16 @@ int mnt_get_gid(const char *groupname, gid_t *gid)
        int rc = -1;
         struct group grp;
        struct group *gr;
-       size_t sz = get_pw_record_size();
        char *buf;
 
        if (!groupname || !gid)
                return -EINVAL;
 
-       buf = malloc(sz);
+       buf = malloc(UL_GETPW_BUFSIZ);
        if (!buf)
                return -ENOMEM;
 
-       if (!getgrnam_r(groupname, &grp, buf, sz, &gr) && gr) {
+       if (!getgrnam_r(groupname, &grp, buf, UL_GETPW_BUFSIZ, &gr) && gr) {
                *gid= gr->gr_gid;
                rc = 0;
        } else {

diff --git a/login-utils/login.c b/login-utils/login.c
index b70846771c49db3bb0e9faec9072b84b56bf8728..2551631d30f29c29d320027b1195b0eebeed81e4 100644 (file)
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -674,22 +674,14 @@ static struct passwd *get_passwd_entry(const char *username,
                                         struct passwd *pwd)
 {
        struct passwd *res = NULL;
-       size_t sz = 16384;
        int x;
 
        if (!pwdbuf || !username)
                return NULL;
 
-#ifdef _SC_GETPW_R_SIZE_MAX
-       {
-               long xsz = sysconf(_SC_GETPW_R_SIZE_MAX);
-               if (xsz > 0)
-                       sz = (size_t) xsz;
-       }
-#endif
-       *pwdbuf = xrealloc(*pwdbuf, sz);
+       *pwdbuf = xrealloc(*pwdbuf, UL_GETPW_BUFSIZ);
 
-       x = getpwnam_r(username, pwd, *pwdbuf, sz, &res);
+       x = getpwnam_r(username, pwd, *pwdbuf, UL_GETPW_BUFSIZ, &res);
        if (!res) {
                errno = x;
                return NULL;

diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder
new file mode 100644 (file)
index 0000000..4448e08
--- /dev/null
+++ b/tests/expected/sfdisk/gpt-reorder
@@ -0,0 +1,45 @@
+Checking that no-one is using this disk right now ... OK
+
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / 32768 bytes
+
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Script header accepted.
+>>> Created a new <removed>.
+Created a new <removed>.
+<removed>2: Created a new <removed>.
+<removed>3: Created a new <removed>.
+<removed>4: Created a new <removed>.
+<removed>5: 
+New situation:
+
+Device             Start    End Sectors Size Type
+<removed>1   8192  14335    6144   3M Linux filesystem
+<removed>2   2048   8191    6144   3M Linux filesystem
+<removed>3  20480 102366   81887  40M Linux filesystem
+<removed>4  14336  20479    6144   3M Linux filesystem
+
+Partition table entries are not in disk order.
+
+The partition table has been altered.
+Calling ioctl() to re-read partition table.
+Syncing disks.
+
+The partition table has been altered.
+Calling ioctl() to re-read partition table.
+Syncing disks.
+Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 4096 bytes
+I/O size (minimum/optimal): 4096 bytes / 32768 bytes
+Disklabel type: gpt
+Disk identifier: <removed>
+
+Device             Start    End Sectors Size Type
+<removed>1   2048   8191    6144   3M Linux filesystem
+<removed>2   8192  14335    6144   3M Linux filesystem
+<removed>3  14336  20479    6144   3M Linux filesystem
+<removed>4  20480 102366   81887  40M Linux filesystem

diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 1a023a6b801f0ec5290b628a414d1c02afc64deb..cc1d9cfebbbce88271151b3ec35ea2d77243689b 100755 (executable)
--- a/tests/ts/eject/umount
+++ b/tests/ts/eject/umount
@@ -8,9 +8,9 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_EJECT"
-ts_check_prog "mkfs.ext2"
 
 ts_skip_nonroot
+ts_check_prog "mkfs.ext2"
 
 #
 # Note that eject --force is required because scsi_debug is

diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index 8edda4b6e40407b42712c53d5e4b568a7d5182e5..2a55907a754fb4510dcd9d41a0a7914b19e891bf 100755 (executable)
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -22,10 +22,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_MOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 > $TS_OUTPUT
 

diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index 9048e4dbbeb4ec7aa7f0368757da9823935efb73..e860724d41842dc8314cea977ea3474bfdf8f88a 100755 (executable)
--- a/tests/ts/ipcs/limits
+++ b/tests/ts/ipcs/limits
@@ -20,7 +20,6 @@ TS_TOPDIR="${0%/*}/../.."
 TS_DESC="limits overflow"
 
 . $TS_TOPDIR/functions.sh
-
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_IPCS"

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 9424fef90bc2d3a50c3623aace751451744d4b68..357cab45a77fa9d296b807105bc830b4fc807530 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -13,10 +13,11 @@ ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_UUIDGEN"
+
+ts_skip_nonroot
 ts_check_prog "mkfs.ext3"
 ts_check_prog "mkfs.ext4"
 
-ts_skip_nonroot
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
 LABEL=libmount-test
 UUID=$($TS_CMD_UUIDGEN)

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 0f8398f6efa193f532a9c30d2e89a096a8c93434..377982fe7af056d6bbfdbbd53687d3e990e0477f 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -13,11 +13,12 @@ ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_UUIDGEN"
+
+ts_skip_nonroot
 ts_check_prog "mkfs.ext3"
 ts_check_prog "mkfs.ext4"
 
 ts_init_py libmount
-ts_skip_nonroot
 
 TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT"
 [ -x $TESTPROG ] || ts_die "test script missing"

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index d6e7494e7111dc54b84efed508937852fda552ae..f6c3024af16e7ce746eba73317f93a6a6784a8f1 100755 (executable)
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -12,8 +12,9 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_WIPEFS"
 ts_check_test_command "$TS_CMD_UUIDGEN"
-ts_check_prog "mkfs.ext4"
+
 ts_skip_nonroot
+ts_check_prog "mkfs.ext4"
 
 TESTPROG="$TS_HELPER_LIBMOUNT_CONTEXT"
 LABEL=libmount-test

diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 00af69554eee8391ea5dc5249f405e0c4b5ddbfd..7603aa7e4bd9ad00ab6386409934804135507b53 100755 (executable)
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -11,11 +11,11 @@ ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_FINDMNT"
 ts_check_test_command "$TS_CMD_WIPEFS"
 ts_check_test_command "$TS_CMD_UUIDGEN"
-ts_check_prog "mkfs.ext4"
 
-ts_init_py libmount
 ts_skip_nonroot
+ts_check_prog "mkfs.ext4"
 
+ts_init_py libmount
 
 TESTPROG="$TS_HELPER_PYLIBMOUNT_CONTEXT"
 [ -x $TESTPROG ] || ts_die "test script missing"

diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 662d38b6c604dd521b70cc8ba2ae1aafb6f37bdc..598b11cf623ffd56faee9e183baa6678b76bc2f9 100755 (executable)
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -5,6 +5,7 @@ TS_DESC="tags"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
+
 ts_skip_nonroot
 
 if [ -f "$ASAN_SYMBOLIZER_PATH" ]; then

diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py
index 47efa70e1d8fb477de8b53fac4cfefdae74f6cd2..4fd2a2695c304aa7fd816ca6453c14dcf37dc7d8 100755 (executable)
--- a/tests/ts/libmount/tabfiles-tags-py
+++ b/tests/ts/libmount/tabfiles-tags-py
@@ -5,9 +5,11 @@ TS_DESC="tags-py"
 
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
-ts_init_py libmount
+
 ts_skip_nonroot
 
+ts_init_py libmount
+
 if [ -f "$ASAN_SYMBOLIZER_PATH" ]; then
        TS_KNOWN_FAIL="yes"
 fi

diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index 2ba5effb6be35edc772bce6bb8cf55171af1df64..2570fe3f5c7687187673aae8d730353f14660315 100755 (executable)
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
index 599173002f62282b0595d4a3bafe123b7a72e75a..63f1fab12207a2fa2a84ad36de778ba65ba9fe90 100755 (executable)
--- a/tests/ts/mount/fslists
+++ b/tests/ts/mount/fslists
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index 05704969b97e32b373e438030a22efdfeb689cc3..f04e270406311896d87ebb006bb67f98a9a15aa6 100755 (executable)
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -23,10 +23,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index f55d2056b539d6dccd825087cb25625ac937bb0d..e135a2bee5cc6a0be08c715ecf84163b828fb8b1 100755 (executable)
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 66d9046dce6c0f390525090e31697a1124e6fda6..8fca1b90e049288afa05eca3705711a23b1bbd51 100755 (executable)
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -23,10 +23,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index e0d819b9a42336260709248d2b014f752be4cd2c..8eec212cffc7d878f59d79b8c4af2c3d36247935 100755 (executable)
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index 6bb23a5f950f3bc1b70030cf7c1dab829250e219..7ad2349d9ec526d5a1abc9043993d73d44367205 100755 (executable)
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index 08a2927bf87e87c88f583e26d675e1c0bee634b4..2a759f0c147531ea6b273c7f07cce417cc3f21ca 100755 (executable)
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -25,10 +25,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index bf00e13556f965aeb86fbdf5f073ebb450a87e61..ba8dafb5b299576ce7205d41d48303ec0c984be1 100755 (executable)
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 LINKNAME="$TS_OUTDIR/${TS_TESTNAME}_lnk"
 

diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index 6d7c5bf3cd21a828edd32e52224ebf70b9b18afe..867bc081df2a5de78b64e7ffbc5604d453dae9b8 100755 (executable)
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -23,10 +23,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index 6c90097205c9b3a08319bad3190e5b3739960e13..0196843e39fb47da8b38e9ce38d3eeb07e095b7d 100755 (executable)
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -23,10 +23,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index 77895e31c2eec815ad99e15f01f84230409b0c3a..641838979e2a6ec075092732ee6e57d742a58b41 100755 (executable)
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -24,10 +24,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 5e935c032c1816ce123b03b55c3a5c185ec0b497..451a9eb678319d4b0826f7ff97d11285bb3dcb44 100755 (executable)
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -25,10 +25,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index 8278e84b1e796a97336ac2a2af80c777d13ac978..9898062480841e8970cd5acaf59d6f61f033f96c 100755 (executable)
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -11,10 +11,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 IMAGE=$(ts_image_init)
 mkfs.ext3 -F $IMAGE &> /dev/null || ts_die "Cannot make ext3 on $IMAGE"

diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index 9fa14b6b8c681190411d5307676700c74a652e25..71769275298707c44660dffe17fb02db48c906fc 100755 (executable)
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -23,10 +23,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_FINDMNT"
-ts_check_prog "mkfs.ext2"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext2"
 
 # mountpoint
 [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT

diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index 5e6880c4feb9717ab846f37f17e20c59d32f0103..8469084003dad263d68269a17d70d9bf009f69d8 100755 (executable)
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -31,10 +31,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 [ -L /etc/mtab ] && ts_skip "mtab is symlink"
 [ "$(stat --format '%s' /etc/mtab)" -gt "1024" ] || ts_skip "mtab is too small"

diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index b68a1aa99fbde8bdb5e4531abfb33a4fe3cf03a7..038e0257282e5c185216e9d8dea6430967b1d6f0 100755 (executable)
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -9,10 +9,10 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_FINDMNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 [ -d $TS_MOUNTPOINT ] || mkdir -p $TS_MOUNTPOINT
 

diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 3b5498fc20634a70f8947ff64e42e91853e71ec8..59c7e039497403fb517a34aa3b272ba922706a22 100755 (executable)
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -11,9 +11,9 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_FDISK"
-ts_check_prog "mkfs.ext2"
 
 ts_skip_nonroot
+ts_check_prog "mkfs.ext2"
 
 $TS_CMD_UMOUNT --help | grep -q all-targets
 [ $? -eq 1 ] && ts_skip "all-targets unsupported"

diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 2795173f7b1a8fa4c7679d5fad49d22693d9224f..29669a88d0d69fcd6cf6328069e8d5389a57ae38 100755 (executable)
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -11,9 +11,9 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_CMD_FDISK"
-ts_check_prog "mkfs.ext2"
 
 ts_skip_nonroot
+ts_check_prog "mkfs.ext2"
 
 $TS_CMD_UMOUNT --help | grep -q recursive
 [ $? -eq 1 ] && ts_skip "recursive unsupported"

diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index 6af358c7db2110fb55ce2e0a142e1a1747751a6f..442860ca4b1fdc3099c1570dd2b99c8bac4dcec8 100755 (executable)
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -23,10 +23,10 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
-ts_check_prog "mkfs.ext3"
 
 ts_skip_nonroot
 ts_check_losetup
+ts_check_prog "mkfs.ext3"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/partx/partx b/tests/ts/partx/partx
index 91bab4f1876cef872bec1f05e5a043af2bd62dd3..37990d8be1df4aa7fd04153f9a154f3e27059c1a 100755 (executable)
--- a/tests/ts/partx/partx
+++ b/tests/ts/partx/partx
@@ -22,8 +22,6 @@ TS_IMGDIR="$TS_TOPDIR/ts/blkid/images-pt"
 PARTS=3
 
 . $TS_TOPDIR/functions.sh
-ts_check_prog "xz"
-
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_PARTX"
@@ -31,6 +29,7 @@ ts_check_test_command "$TS_CMD_ADDPART"
 ts_check_test_command "$TS_CMD_DELPART"
 
 ts_skip_nonroot
+ts_check_prog "xz"
 
 mkdir -p $TS_OUTDIR/images-pt
 for img in $(ls $TS_IMGDIR/*.img.xz | sort); do

diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata
index 97f3f2bd04aaf2ee3c401a415fbfeda1e35e75d9..b4b9537551d28e3084cd40d535d47555f0353dd2 100755 (executable)
--- a/tests/ts/sfdisk/movedata
+++ b/tests/ts/sfdisk/movedata
@@ -24,6 +24,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_SFDISK"
 
 ts_skip_nonroot
+ts_check_prog "mkfs.ext4"
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=100 sector_size=512