QA tweaks - use a single os type source mainly (drop get_os, use HOST_OS)

diff --git a/010 b/010
index 72ecec81ac09fad751528b1c0cb9c3a54c4db30d..8b646f982da68297d68a5939f1801fe31b0d1eb1 100755 (executable)
--- a/010
+++ b/010
@@ -70,9 +70,6 @@ _filter_dbtest()
 # link correct .out file
 _link_out_file $seq.out
 
-# put operating system in $os
-_get_os
-
 [ -x $here/src/dbtest ] || _notrun "dbtest was not built for this platform"
 
 # real QA test starts here
@@ -85,11 +82,7 @@ rm -f $seq.full
 
 cd $testdir
 
-if [ $os == 'irix' ]; then
-    $here/src/dbtest -l 5 -n 500 2>&1 | tee -a $here/$seq.full | _filter_dbtest
-elif [ $os == 'linux' ]; then
-    $here/src/dbtest -l 5 -n 3000 2>&1 | tee -a $here/$seq.full | _filter_dbtest
-fi
+$here/src/dbtest -l 5 -n 3000 2>&1 | tee -a $here/$seq.full | _filter_dbtest
 
 # success, all done
 exit

diff --git a/013 b/013
index e6af9d60b6b1f7cac5da109a86a814f807754850..2e0d74e160bceb7b5fcad8069759e4821e765b4e 100755 (executable)
--- a/013
+++ b/013
@@ -65,9 +65,6 @@ _filesize()
 . ./common.rc
 . ./common.filter
 
-# put operating system in $os
-_get_os
-
 _do_test()
 {
     _n="$1"
@@ -114,14 +111,7 @@ _setup_testdir
 rm -f $here/$seq.full
 echo "brevity is wit..."
 
-if [ $os == 'irix' ]; then
-    count=1024    
-elif [ $os == 'linux' ]; then
-    count=2000
-else
-    echo Error test $seq does not run on the operating system: `uname`
-    exit
-fi
+count=2000
 procs=20
 
 _check_test_fs

diff --git a/062 b/062
index 892369b6e2bde74977fa487a80515a4ff4670966..26d1f1a962551236c9e66d31122344ee68bda8d1 100755 (executable)
--- a/062
+++ b/062
@@ -50,8 +50,6 @@ status=1      # failure is the default!
 . ./common.rc
 . ./common.filter
 
-_get_os
-
 _cleanup()
 {
         cd /
@@ -135,7 +133,6 @@ _create_test_bed()
 _supported_fs xfs udf nfs
 _supported_os Linux
 
-
 _require_scratch
 rm -f $tmp.backup1 $tmp.backup2 $seq.full
 

diff --git a/085 b/085
index 04d27f04959a6ca0389c73ea6e80c9a2784777f4..171e1171b684e9004f20bf57438e73c0e17a625b 100755 (executable)
--- a/085
+++ b/085
@@ -53,9 +53,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# put operating system in $os
-_get_os
-
 # real QA test starts here
 _supported_fs xfs
 _supported_os IRIX Linux
@@ -74,19 +71,6 @@ _do_logprint()
 rm -f $seq.full
 rm -f $tmp.log
 
-
-if [ $os == 'irix' ]; then
-    tail -f /var/adm/SYSLOG >$tmp.log &
-elif [ $os == 'linux' ]; then
-    tail -f /var/log/messages >$tmp.log &
-else
-    echo Error test $seq does not run on the operating system: `uname`
-    exit
-fi
-
-pid=$!
-cp $tmp.log $tmp.log.orig # note the original log
-
 _require_scratch
 
 echo "mkfs"

diff --git a/check b/check
index 29c4285f15faf38bf40a3c0fef893c69466297d0..33f307f3ab91772d7d15472614a19a6ac25e89f6 100755 (executable)
--- a/check
+++ b/check
@@ -157,9 +157,6 @@ timestamp=${TIMESTAMP:=false}
 
 [ -f check.time ] || touch check.time
 
-_get_os
-if [ $os == "linux" ]; then
-
 FULL_FSTYP_DETAILS=`_full_fstyp_details`
 FULL_HOST_DETAILS=`_full_platform_details`
 FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
@@ -172,12 +169,6 @@ MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS
 MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
 
 EOF
-fi
-
-#Linux specific flag '-f'
-if [ $os == "linux" ]; then
-   flag='-f'
-fi
 
 umount $SCRATCH_DEV 2>/dev/null
 # call the overridden mkfs.xfs - make sure the FS is built

diff --git a/common.config b/common.config
index 2a791277cdcb83d01596f32d40b1ed6455f80e98..7d53bd7c57a63330b7da4ace6199da7a85ab1633 100644 (file)
--- a/common.config
+++ b/common.config
@@ -83,11 +83,6 @@ export HOST_OPTIONS=${HOST_OPTIONS:=local.config}
 export CHECK_OPTIONS=${CHECK_OPTIONS:="-g auto"}
 export BENCH_PASSES=${BENCH_PASSES:=5}
 export XFS_MKFS_OPTIONS=${XFS_MKFS_OPTIONS:=-bsize=4096}
-[ "$HOSTOS" == "Linux" ] && export XFS_MOUNT_OPTIONS=${XFS_MOUNT_OPTIONS:=-ologbufs=2}
-export UDF_MKFS_OPTIONS=${UDF_MKFS_OPTIONS}
-export UDF_MOUNT_OPTIONS=${UDF_MOUNT_OPTIONS}
-export NFS_MKFS_OPTIONS=${NFS_MKFS_OPTIONS}
-export NFS_MOUNT_OPTIONS=${NFS_MOUNT_OPTIONS}
 
 #export DEBUG=${DEBUG:=...} # arbitrary CFLAGS really.
 export MALLOCLIB=${MALLOCLIB:=/usr/lib/libefence.a}

diff --git a/common.rc b/common.rc
index 225b2f46bef5e792316e3e65c38c6b618fed945e..62fc33f34fc73b3a9f6e55ee978d26d73391d8f4 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -100,6 +100,7 @@ _scratch_options()
 
     case $type in
     mkfs)
+       [ "$HOSTOS" != "IRIX" ] && SCRATCH_OPTIONS="$SCRATCH_OPTIONS -f"
        rt_opt="-r"
         log_opt="-l"
        ;;
@@ -123,8 +124,7 @@ _test_options()
         return
     fi
 
-    case $type
-    in
+    case $type in
     mkfs)
        rt_opt="-r"
         log_opt="-l"
@@ -164,10 +164,8 @@ _scratch_mkfs_options()
 }
 
 _scratch_mkfs_xfs()
-{ 
+{
     _scratch_options mkfs 
-    [ "$HOSTOS" != "IRIX" ] && \
-        SCRATCH_OPTIONS="$SCRATCH_OPTIONS -f"
 
     $MKFS_XFS_PROG $SCRATCH_OPTIONS $MKFS_OPTIONS $* $SCRATCH_DEV
     mkfs_status=$?
@@ -788,8 +786,6 @@ _check_test_fs()
 
 _check_scratch_fs()
 {
-
-
     case $FSTYP in
     xfs)
        SCRATCH_LOG=""
@@ -833,8 +829,6 @@ _full_platform_details()
 
 _check_testdir()
 {
-  
-
     case $FSTYP in
     xfs)
        _check_test_fs
@@ -915,8 +909,6 @@ _setup_nfs_testdir()
 
 _setup_testdir()
 {
-
-
     case $FSTYP in
     xfs)
        _setup_xfs_testdir
@@ -935,8 +927,6 @@ _setup_testdir()
 
 _cleanup_testdir()
 {
-
-
     case $FSTYP in
     xfs)
        # do nothing, testdir is $TEST_DIR
@@ -1009,18 +999,5 @@ _link_out_file()
    fi
 }
 
-_get_os()
-{
-   
-   if [ "`uname`" == "IRIX64" ] || [ "`uname`" == "IRIX" ]; then
-      os=irix
-   elif [ "`uname`" == "Linux" ]; then
-      os=linux
-   else
-      echo Error test does not run on the operating system: `uname`
-      exit
-   fi
-}
-
 # make sure this script returns success
 /bin/true