From 4800bae8cccf65f3a242869d5ef960bd677a480e Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 7 Jul 2006 16:00:24 +0000 Subject: [PATCH] The test device is now used as a nfs filesystem. Merge of master-melb:xfs-cmds:26462a by kenmcd. modified this test to run on xfs only. --- 078 | 3 ++- check | 23 +++++++++++++++++------ common.config | 12 +++++++++++- common.rc | 19 +++++++++++++------ 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/078 b/078 index 19da2f09..9f7b4c5b 100755 --- a/078 +++ b/078 @@ -4,7 +4,7 @@ # Check several growfs corner cases # #----------------------------------------------------------------------- -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2003,2006 Silicon Graphics, Inc. All Rights Reserved. #----------------------------------------------------------------------- # # creator @@ -48,6 +48,7 @@ _filter_io() } # real QA test starts here +_supported_fs xfs echo "*** create loop mount point" rm -f $LOOP_MNT 2>/dev/null mkdir $LOOP_MNT || _fail "cannot create loopback mount point" diff --git a/check b/check index c44b5290..7ca17eff 100755 --- a/check +++ b/check @@ -2,7 +2,7 @@ # # Control script for QA # -# Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2002,2006 Silicon Graphics, Inc. All Rights Reserved. # tmp=/tmp/$$ @@ -16,8 +16,24 @@ interrupt=true export QA_CHECK_FS=${QA_CHECK_FS:=true} +# by default don't output timestamps +timestamp=${TIMESTAMP:=false} + # generic initialization iam=check + +# we need common.config +if ! . ./common.config +then + echo "$iam: failed to source common.config" + exit 1 +fi + +# we need common +. ./common + + +# we need common.rc if ! . ./common.rc then echo "check: failed to source common.rc" @@ -122,11 +138,6 @@ echo "preamble" >/tmp/check.sts # don't leave old full output behind on a clean run rm -f check.full -# by default don't output timestamps -timestamp=${TIMESTAMP:=false} - -. ./common - [ -f check.time ] || touch check.time FULL_FSTYP_DETAILS=`_full_fstyp_details` diff --git a/common.config b/common.config index e2d8357e..ff871c5e 100644 --- a/common.config +++ b/common.config @@ -1,6 +1,6 @@ ##/bin/sh # -# Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2003,2006 Silicon Graphics, Inc. All Rights Reserved. # # setup and check for config parameters, and in particular # @@ -160,6 +160,16 @@ known_hosts() #RMT_IRIXTAPE_DEV=snort:/dev/tape #RMT_TAPE_USER=guest ;; + break) + MODULAR=1 + EMAIL="nathans@larry" + SCRATCH_MNT=/mnt/scratch + #SCRATCH_DEV=/dev/sda6 + SCRATCH_DEV=budgie:/mnt/scratch + TEST_DIR=/mnt/test + #TEST_DEV=/dev/sda5 + TEST_DEV=budgie:/mnt/test + ;; bruce) MODULAR=0 EMAIL="nathans@larry" diff --git a/common.rc b/common.rc index d6682d26..67c2488d 100644 --- a/common.rc +++ b/common.rc @@ -1,6 +1,6 @@ ##/bin/sh #----------------------------------------------------------------------- -# Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -79,10 +79,13 @@ _mkfs_opts() # we need common.config -if ! . ./common.config +if [ "$iam" != "check" ] then - echo "$iam: failed to source common.config" - exit 1 + if ! . ./common.config + then + echo "$iam: failed to source common.config" + exit 1 + fi fi # make sure we have a standard umask @@ -98,7 +101,7 @@ _scratch_options() type=$1 SCRATCH_OPTIONS="" - if [ $FSTYP != "xfs" ]; then + if [ "$FSTYP" != "xfs" ]; then return fi @@ -124,7 +127,7 @@ _test_options() type=$1 TEST_OPTIONS="" - if [ $FSTYP != "xfs" ]; then + if [ "$FSTYP" != "xfs" ]; then return fi @@ -822,6 +825,10 @@ _check_udf_filesystem() _check_test_fs() { + if [ "$FSTYP" != "xfs" ]; then + return + fi + TEST_LOG="none" TEST_RT="none" [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \ -- 2.39.5