Update QA tests and host configs.

Merge of xfs-cmds-melb:slinx:19518a by kenmcd.

diff --git a/094 b/094
index 7439089c794a814d26525bc97ca26c63f27502a4..fcabd2ddadaa1bec08ba69957dfc49731c0148ed 100755 (executable)
--- a/094
+++ b/094
@@ -61,7 +61,7 @@ _supported_fs xfs
 _supported_os IRIX Linux
 _require_realtime
 _require_scratch
-_require_xfs_io
+_require_command /usr/sbin/xfs_io
 
 _filter_scratch()
 {

diff --git a/common.config b/common.config
index f7257387ff90568d101cad3d969eec656d1f7572..bd9343babbdba455cff0176a745a63894739ba44 100644 (file)
--- a/common.config
+++ b/common.config
@@ -182,11 +182,11 @@ known_hosts()
                EMAIL="nathans@larry"
                SCRATCH_MNT=/mnt/xfs0
                SCRATCH_DEV=/dev/sdb5
-               SCRATCH_RTDEV=/dev/sdc1
+               #SCRATCH_RTDEV=/dev/sdc1
                SCRATCH_LOGDEV=/dev/sda11
                TEST_DIR=/mnt/xfs1
                TEST_DEV=/dev/sdc3
-               TEST_RTDEV=/dev/sdb6
+               #TEST_RTDEV=/dev/sdb6
                TEST_LOGDEV=/dev/sda9
                TAPE_DEV=/dev/st0
                RMT_TAPE_DEV=bruce:/dev/st0

diff --git a/common.rc b/common.rc
index e7ec4790e436e44eca6bfb52d4ae74bf40096102..b806994925202979fea65d6d91c04f4549326498 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -591,13 +591,11 @@ _require_realtime()
        _notrun "Realtime device required, skipped this test"
 }
 
-# this test requires that a realtime subvolume is in use, and
-# that the kernel supports realtime as well.
+# this test requires that a specified command (executable) exists
 # 
-_require_xfs_io()
+_require_command()
 {
-    [ -x /usr/sbin/xfs_io ] || \
-       _notrun "xfs_io utility required, skipped this test"
+    [ -x "$1" ] || _notrun "$1 utility required, skipped this test"
 }
 
 # this test requires that external log/realtime devices are not in use