]> www.infradead.org Git - users/hch/xfstests-dev.git/commitdiff
Fix .full file overwrite in test 106, enable project quota QA in 108.
authorNathan Scott <nathans@sgi.com>
Fri, 3 Jun 2005 03:48:40 +0000 (03:48 +0000)
committerNathan Scott <nathans@sgi.com>
Fri, 3 Jun 2005 03:48:40 +0000 (03:48 +0000)
Merge of master-melb:xfs-cmds:22787a by kenmcd.

106
108
108.out

diff --git a/106 b/106
index ecb97592a53df4b722431b9a5b6e9c070e830e36..2a3cfaeb5e0a568c1e4bd05308f7659b49e73e87 100755 (executable)
--- a/106
+++ b/106
@@ -58,7 +58,7 @@ _require_quota
 
 # real QA test starts here
 _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
-cat $tmp.mkfs >>$seq.full
+cat $tmp.mkfs >$seq.full
 . $tmp.mkfs
 
 # setup a default run
diff --git a/108 b/108
index 93aa55ad9f7907f9b3ba205310b878303f64cb05..20fbaf8d64041e66d08d5bb0e61049331698c770 100755 (executable)
--- a/108
+++ b/108
@@ -135,8 +135,8 @@ export MOUNT_OPTIONS="-opquota"
 _qmount
 type=p
 id=$prid
-#test_files
-#test_accounting
+test_files
+test_accounting
 umount $SCRATCH_DEV 2>/dev/null
 
 status=0
diff --git a/108.out b/108.out
index e8062ad5d05e3ff6bcaa3c01c4c0588ba98224c1..7745579919bddf43e616540901ee2ed6591f802e 100644 (file)
--- a/108.out
+++ b/108.out
@@ -69,3 +69,33 @@ Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
 Disk quotas for Group #2 (2)
 Filesystem    Files  Quota  Limit Warn/Time    Mounted on
 [SCR_DEV]         3      0      0  00 [------] [SCR_MNT]
+
+### create files, setting up ownership (type=p)
+  File: "[SCR_MNT]/buffer"
+  Size: 0            Filetype: Regular File
+  Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
+projid = 3
+  File: "[SCR_MNT]/direct"
+  Size: 0            Filetype: Regular File
+  Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
+projid = 3
+  File: "[SCR_MNT]/mmap"
+  Size: 0            Filetype: Regular File
+  Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
+projid = 3
+### some controlled buffered, direct and mmapd IO (type=p)
+  File: "[SCR_MNT]/buffer"
+  Size: 16777216     Filetype: Regular File
+  Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
+  File: "[SCR_MNT]/direct"
+  Size: 16777216     Filetype: Regular File
+  Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
+  File: "[SCR_MNT]/mmap"
+  Size: 16777216     Filetype: Regular File
+  Mode: (0600/-rw-------)         Uid: (1)  Gid: (2)
+Disk quotas for Project #3 (3)
+Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
+[SCR_DEV]       48M      0      0  00 [------] [SCR_MNT]
+Disk quotas for Project #3 (3)
+Filesystem    Files  Quota  Limit Warn/Time    Mounted on
+[SCR_DEV]         3      0      0  00 [------] [SCR_MNT]