Fix up test, skip v1 dirs component.

Merge of master-melb:xfs-cmds:21939a by kenmcd.

diff --git a/019 b/019
index cec3d349e103a08756fad55d4fb33e0d8b464e3c..9c3e44eb848753a487806ca73b2f8bbee81f6058 100755 (executable)
--- a/019
+++ b/019
@@ -144,7 +144,7 @@ _verify_fs()
        _check_scratch_fs
 }
 
        _check_scratch_fs
 }
 

-_verify_fs 1
+#_verify_fs 1

 _verify_fs 2
 
 echo "*** done"
 _verify_fs 2
 
 echo "*** done"

diff --git a/019.out b/019.out
index 02606b7f470659a47a60fc9e661c7a0f4c882a57..0c1bf8f18146da202e0f6f1c2955dd55861e7c14 100644 (file)
--- a/019.out
+++ b/019.out
@@ -1,85 +1,5 @@
 QA output created by 019
 Wrote 2048.00Kb (value 0x2c)
 QA output created by 019
 Wrote 2048.00Kb (value 0x2c)

-*** create FS version 1
-*** check FS
-*** mount FS
-*** verify FS
- File: "."
- Size: <DSIZE> Filetype: Directory
- Mode: (0777/drwxrwxrwx) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 3 
-
- File: "./bigfile"
- Size: 2097152 Filetype: Regular File
- Mode: (0666/-rw-rw-rw-) Uid: (3) Gid: (0)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./block_device"
- Size: 0 Filetype: Block Device
- Mode: (0012/b-----x-w-) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 161,162
-
- File: "./char_device"
- Size: 0 Filetype: Character Device
- Mode: (0345/c-wxr--r-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 Device type: 177,178
-
- File: "./directory"
- Size: <DSIZE> Filetype: Directory
- Mode: (0755/drwxr-xr-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 2 
-
- File: "./directory/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_0"
- Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./directory/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_1"
- Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./directory/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_2"
- Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./directory/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3"
- Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./directory/file_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_4"
- Size: 5 Filetype: Regular File
- Mode: (0755/-rwxr-xr-x) Uid: (3) Gid: (1)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./pipe"
- Size: 0 Filetype: Fifo File
- Mode: (0670/frw-rwx---) Uid: (0) Gid: (0)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./setgid"
- Size: 5 Filetype: Regular File
- Mode: (2666/-rw-rwsrw-) Uid: (0) Gid: (0)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./setugid"
- Size: 5 Filetype: Regular File
- Mode: (6666/-rwsrwsrw-) Uid: (0) Gid: (0)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./setuid"
- Size: 5 Filetype: Regular File
- Mode: (4666/-rwsrw-rw-) Uid: (0) Gid: (0)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-
- File: "./symlink"
- Size: 7 Filetype: Symbolic Link
- Mode: (0123/l--x-w--wx) Uid: (0) Gid: (0)
-Device: <DEVICE> Inode: <INODE> Links: 1 
-*** unmount FS
-*** check FS

 *** create FS version 2
 *** check FS
 *** mount FS
 *** create FS version 2
 *** check FS
 *** mount FS