unicode_wcwidth.c: shrink

[oweals/busybox.git] / testsuite / mount.tests

diff --git a/testsuite/mount.tests b/testsuite/mount.tests
index 5131006333557a719b8148cb0391c0cac031b55b..8bd60ea0cab366c2454d899e1d5a8477570977af 100755 (executable)
--- a/testsuite/mount.tests
+++ b/testsuite/mount.tests
@@ -1,34 +1,36 @@
 #!/bin/sh
-
 # Copyright 2007 by Denys Vlasenko <vda.linux@googlemail.com>
 # Licensed under GPL v2, see file LICENSE for details.
 
-. testing.sh
+. ./testing.sh
 
 test "`id -u`" = 0 || {
        echo "SKIPPED: must be root to test this"
        exit 0
 }
 
-dd if=/dev/zero of=image1m count=1 bs=1M 2>/dev/null || exit 1
-mkfs.minix -v image1m >/dev/null 2>&1 || exit 1
 testdir=$PWD/testdir
-mkdir $testdir 2>/dev/null
-umount -d $testdir 2>/dev/null
+
+dd if=/dev/zero of=mount.image1m count=1 bs=1M 2>/dev/null || { echo "dd error"; exit 1; }
+mkfs.minix -v mount.image1m >/dev/null 2>&1 || { echo "mkfs.minix error"; exit 1; }
+modprobe minix 2>/dev/null
+mkdir "$testdir" 2>/dev/null
+umount -d "$testdir" 2>/dev/null
 
 # testing "test name" "command" "expected result" "file input" "stdin"
 #   file input will be file called "input"
 #   test can create a file "actual" instead of writing to stdout
 
 testing "mount -o remount,mand" \
-"mount -o loop image1m $testdir "\
+"mount -o loop mount.image1m $testdir "\
 "&& grep -Fc $testdir </proc/mounts "\
 "&& mount -o remount,mand $testdir "\
 "&& grep -F $testdir </proc/mounts | grep -c '[, ]mand[, ]'" \
        "1\n""1\n" \
        "" ""
 
-umount -d $testdir
-rmdir $testdir
+umount -d "$testdir"
+rmdir "$testdir"
+rm mount.image1m
 
 exit $FAILCOUNT