diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-06-28 14:10:00 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-06-28 14:10:00 +0200 |
| commit | 335766602b2598f29a3dd854654b9ba9edb6d7cb (patch) | |
| tree | 96a4ab55d3574f294a7283694bdc7167724b07bd | |
| parent | 8825cb6660b66c412296c2b1e10ca2f965a0a9cd (diff) | |
| download | busybox-335766602b2598f29a3dd854654b9ba9edb6d7cb.tar.gz | |
testsuite/mount.tests: fix false positive
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/loop.c | 4 | ||||
| -rwxr-xr-x | testsuite/mount.tests | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libbb/loop.c b/libbb/loop.c index f0d4296ae..c78535a20 100644 --- a/libbb/loop.c +++ b/libbb/loop.c @@ -106,6 +106,10 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse return -errno; } +//TODO: use LOOP_CTL_GET_FREE instead of trying every loopN in sequence? a-la: +// fd = open("/dev/loop-control", O_RDWR); +// loopN = ioctl(fd, LOOP_CTL_GET_FREE); +// /* Find a loop device. */ try = *device ? *device : dev; /* 1048575 (0xfffff) is a max possible minor number in Linux circa 2010 */ diff --git a/testsuite/mount.tests b/testsuite/mount.tests index a0bc50888..91c2e8b42 100755 --- a/testsuite/mount.tests +++ b/testsuite/mount.tests @@ -10,9 +10,11 @@ test "`id -u`" = 0 || { exit 0 } +# Without MOUNT_LOOP_CREATE, the test will fail if /dev/loopN's do not exist if test x"$CONFIG_MKFS_MINIX" != x"y" \ || test x"$CONFIG_FEATURE_MINIX2" != x"y" \ || test x"$CONFIG_FEATURE_MOUNT_LOOP" != x"y" \ +|| test x"$CONFIG_FEATURE_MOUNT_LOOP_CREATE" != x"y" \ || test x"$CONFIG_FEATURE_MOUNT_FLAGS" != x"y" \ || test x"$CONFIG_FEATURE_DEVFS" = x"y" \ ; then |