diff options
| author | fsgqa <fsgqa> | 2003-05-26 06:34:31 +0000 |
|---|---|---|
| committer | fsgqa <fsgqa> | 2003-05-26 06:34:31 +0000 |
| commit | 3f1c6c654d8650e6736f970548bd1db09431b0b2 (patch) | |
| tree | 3f1585f72ea9109638aa50cc0ab6cbd7ee362f43 /tools | |
| parent | f5836eb712bd63c6b14bbc1126453c184170ba72 (diff) | |
QA test updates for external log/rt devices.
Make sure we don't run this test with mutually exclusive mkfs options.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/auto-qa | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/tools/auto-qa b/tools/auto-qa index 01b64bad..9e66f4b6 100755 --- a/tools/auto-qa +++ b/tools/auto-qa @@ -207,7 +207,27 @@ _update_workarea() cvs -z3 update -d fi } - + +_test_mkfs_xfs() +{ + TEST_OPTIONS="" + [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_RTDEV" ] && \ + TEST_OPTIONS="$TEST_OPTIONS -rrtdev=$TEST_RTDEV" + [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \ + TEST_OPTIONS="$TEST_OPTIONS -llogdev=$TEST_LOGDEV" + _sudo /sbin/mkfs.xfs -f $TEST_OPTIONS $MKFS_OPTIONS $* $TEST_DEV +} + +_test_mount() +{ + TEST_OPTIONS="" + [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_RTDEV" ] && \ + TEST_OPTIONS="$TEST_OPTIONS -ortdev=$TEST_RTDEV" + [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \ + TEST_OPTIONS="$TEST_OPTIONS -ologdev=$TEST_LOGDEV" + _sudo mount -t xfs $TEST_OPTIONS $* $TEST_DEV $TEST_DIR +} + _log "*** linux-xfs QA (`date`)" @@ -461,12 +481,12 @@ do _log " *** clean TEST_DEV" - _sudo mkfs -t xfs -f $MKFS_OPTIONS $TEST_DEV 2>&1 \ + _test_mkfs_xfs 2>&1 \ || _fail " !!! failed to mkfs TEST_DEV" _log " *** mounting TEST_DEV" - _sudo mount -t xfs $TEST_DEV $TEST_DIR 2>&1 \ + _test_mount 2>&1 \ || _fail " !!! failed to mount" new_state="run" |