need to filter out scratch device for setfattr tests since they

report errors and mention the mount point.
Merge of master-melb:xfs-cmds:25252a by kenmcd.

  need to filter out scratch device for setfattr tests since they
  report errors and mention the mount point.

diff --git a/062 b/062
index c7fb2b016aafc3752f88dd15c4b742a153bc668d..c9c29c8feefa97d04e3259e8b8a7987d586defc8 100755 (executable)
--- a/062
+++ b/062
@@ -84,7 +84,7 @@ getfattr()
 
 setfattr()
 {
-    /usr/bin/setfattr $@
+    /usr/bin/setfattr $@ 2>&1 | _filter_scratch
 }
 
 _create_test_bed()

diff --git a/062.out b/062.out
index 0b51f5adc1d0e28dbc610c88a99da92da8fa5d93..8db03e6927aa97d22502554d0e1ab80abeaa7f78 100644 (file)
--- a/062.out
+++ b/062.out
@@ -112,100 +112,100 @@ user.name3=0xdeface
 === TYPE lnk; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: /mnt/xfs0/lnk: Operation not permitted
-setfattr: /mnt/xfs0/lnk: Operation not permitted
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 *** grow value of existing attribute
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 *** set an empty value for second attribute
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 SCRATCH_MNT/lnk: user.name2: Operation not permitted
 *** overwrite empty value
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 SCRATCH_MNT/lnk: user.name2: Operation not permitted
 *** remove attribute
-setfattr: /mnt/xfs0/lnk: Operation not permitted
+setfattr: SCRATCH_MNT/lnk: Operation not permitted
 SCRATCH_MNT/lnk: user.name2: Operation not permitted
 *** final list (strings, type=lnk, nsp=user)
 
 === TYPE dev/b; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 *** grow value of existing attribute
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 *** set an empty value for second attribute
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 SCRATCH_MNT/dev/b: user.name2: Operation not permitted
 *** overwrite empty value
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 SCRATCH_MNT/dev/b: user.name2: Operation not permitted
 *** remove attribute
-setfattr: /mnt/xfs0/dev/b: Operation not permitted
+setfattr: SCRATCH_MNT/dev/b: Operation not permitted
 SCRATCH_MNT/dev/b: user.name2: Operation not permitted
 *** final list (strings, type=dev/b, nsp=user)
 
 === TYPE dev/c; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 *** grow value of existing attribute
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 *** set an empty value for second attribute
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 SCRATCH_MNT/dev/c: user.name2: Operation not permitted
 *** overwrite empty value
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 SCRATCH_MNT/dev/c: user.name2: Operation not permitted
 *** remove attribute
-setfattr: /mnt/xfs0/dev/c: Operation not permitted
+setfattr: SCRATCH_MNT/dev/c: Operation not permitted
 SCRATCH_MNT/dev/c: user.name2: Operation not permitted
 *** final list (strings, type=dev/c, nsp=user)
 
 === TYPE dev/p; NAMESPACE user
 
 *** set/get one initially empty attribute
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 *** overwrite empty, set several new attributes
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 *** fetch several attribute names and values (hex)
 *** fetch several attribute names and values (base64)
 *** shrink value of an existing attribute
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 *** grow value of existing attribute
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 *** set an empty value for second attribute
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 SCRATCH_MNT/dev/p: user.name2: Operation not permitted
 *** overwrite empty value
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 SCRATCH_MNT/dev/p: user.name2: Operation not permitted
 *** remove attribute
-setfattr: /mnt/xfs0/dev/p: Operation not permitted
+setfattr: SCRATCH_MNT/dev/p: Operation not permitted
 SCRATCH_MNT/dev/p: user.name2: Operation not permitted
 *** final list (strings, type=dev/p, nsp=user)