xfstests: add filter to 200 accommodate changed mount output

The mount binary changed its output w.r.t. red-only devices, and
stopped referring to a "block device."

This broke at least test xfs/200; add a common filter to remove
the "block device" from older mount binary output, and change
the 200.out file to match.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

common/filter

@@ -296,5 +296,12 @@ _filter_fstrim()
 	egrep -o "[0-9]+ bytes" | $AWK_PROG '{print $1}'
 }
 
+# Older mount output referred to "block device" when mounting RO devices
+# It's gone in newer versions
+_filter_ro_mount() {
+	sed -e "s/mount: block device//g" \
+	    -e "s/mount: cannot mount block device/mount: cannot mount/g"
+}
+
 # make sure this script returns success
 /bin/true