From 336c44adca1768ada1e1e2f4d7dbbc33e994e582 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Wed, 2 Mar 2016 15:20:04 -0600
Subject: Factor out command name at the start of test name, have runtest.sh
 print it.

---
 tests/mount.test | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests/mount.test')

diff --git a/tests/mount.test b/tests/mount.test
index d64bfc62..6590b946 100755
--- a/tests/mount.test
+++ b/tests/mount.test
@@ -20,69 +20,69 @@ reCreateTmpFs() {
 }
 reCreateTmpFs
 
-testing "mount $root_fs /mnt" \
+testing "$root_fs /mnt" \
   "mount $root_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && test -e /testDir && rmdir /testDir" "" "" ""
-testing "mount $tmp_b_fs /mnt" \
+testing "$tmp_b_fs /mnt" \
   "mount $tmp_b_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && ! test -e /mnt/testDir" "" "" ""
 reCreateTmpFs
 
 chmod 444 /mnt
-testing "mount $root_fs /mnt (read_only dir)" \
+testing "$root_fs /mnt (read_only dir)" \
   "mount $root_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && test -e /testDir && rmdir /testDir" "" "" ""
-testing "mount $tmp_b_fs /mnt (read_only dir)" \
+testing "$tmp_b_fs /mnt (read_only dir)" \
   "mount $tmp_b_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && ! test -e /mnt/testDir" "" "" ""
 reCreateTmpFs
 chmod 755 /mnt
-testing "mount -w $root_fs /mnt (write_only mode)" \
+testing "-w $root_fs /mnt (write_only mode)" \
   "mount -w $root_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && test -e /testDir && rmdir /testDir" "" "" ""
-testing "mount -w $tmp_b_fs /mnt (write_only mode)" \
+testing "-w $tmp_b_fs /mnt (write_only mode)" \
   "mount -w $tmp_b_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && ! test -e /mnt/testDir" "" "" ""
 reCreateTmpFs
-testing "mount -rw $tmp_b_fs /mnt (read_write mode)" \
+testing "-rw $tmp_b_fs /mnt (read_write mode)" \
   'mount -rw $tmp_b_fs /mnt >/dev/null && mkdir /mnt/testDir && \
    sleep 1 && ! test -e /mnt/testDir && umount /mnt' "" "" ""
 reCreateTmpFs
-testing "mount $tmp_b_fs /mnt -t fs_type" \
+testing "$tmp_b_fs /mnt -t fs_type" \
   "mount $tmp_b_fs /mnt -t $tmp_b_fs_type >/dev/null 2>&1 &&
    mkdir /mnt/testDir && sleep 1 && umount /mnt &&
    ! test -e /mnt/testDir" "" "" ""
 reCreateTmpFs
 mkdir -p testDir1/testDir2 testDir
 echo "abcdefghijklmnopqrstuvwxyz" > testDir1/testDir2/testFile
-testing "mount -o bind dir1 dir2" \
+testing "-o bind dir1 dir2" \
   'mount -o bind testDir1 testDir >/dev/null 2>&1 && \
    cat testDir/testDir2/testFile && sleep 1 && umount testDir' \
   "abcdefghijklmnopqrstuvwxyz\n" "" ""
-testing "mount -o rbind dir1 dir2" \
+testing "-o rbind dir1 dir2" \
   'mount -o rbind testDir1 testDir >/dev/null 2>&1 && \
    cat testDir/testDir2/testFile && sleep 1 && umount testDir' \
   "abcdefghijklmnopqrstuvwxyz\n" "" ""
-testing "mount -o loop $tmp_b_fs /mnt" \
+testing "-o loop $tmp_b_fs /mnt" \
   "mount -o loop $tmp_b_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDirp &&
    sleep 1 && umount -d /mnt && ! test -e /mnt/testDirp" "" "" ""
 reCreateTmpFs
 
 mkdir testDir2
-testing "mount -o move mount_1 mount_2" \
+testing "-o move mount_1 mount_2" \
   "mount $tmp_b_fs testDir1 && mkdir testDir1/testDirr &&
    mount -o move testDir1 testDir2 && test -r testDir2/testDirr &&
    sleep 1 && umount testDir2" "" "" ""
 reCreateTmpFs
-testing "mount -o rw $tmp_b_fs /mnt" \
+testing "-o rw $tmp_b_fs /mnt" \
   "mount -o rw $tmp_b_fs /mnt >/dev/null 2>&1 && mkdir /mnt/testDir &&
    sleep 1 && umount /mnt && ! test -e /mnt/testDir" "" "" ""
 reCreateTmpFs
-testing "mount -o ro $tmp_b_fs /mnt" \
+testing "-o ro $tmp_b_fs /mnt" \
   "mount -o ro $tmp_b_fs /mnt >/dev/null 2>&1 &&
    mkdir /mnt/testDir 2>/dev/null || sleep 1 && umount /mnt" "" "" ""
 reCreateTmpFs
-testing "mount -o ro,remount $tmp_b_fs /mnt" \
+testing "-o ro,remount $tmp_b_fs /mnt" \
   "mount -o ro $tmp_b_fs /mnt >/dev/null 2>&1 &&
    mkdir /mnt/testDir 2>/dev/null || sleep 1 && umount /mnt" "" "" ""
 reCreateTmpFs
-- 
cgit v1.2.3