Re: [Vserver] Updates to testfs.sh script

[micah]

Actually, lets just forget about that previous diff, and instead use
this one. I found that the mkfs.xfs would fail because there previously
was a filesystem created by the mkfs.ext3 and it would complain that you
needed to use -f to force it to happen. Please use the attached diff
instead of the previous (this also bumps the version number one).

Micah


--- testfs.sh-0.09      2005-09-19 04:27:43.000000000 -0400
+++ testfs.sh-0.10      2005-10-04 17:16:07.000000000 -0400
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-eR='\e[31m';eG='\e[32m';eY='\e[33m';eB='\e[34m';eN='\e[0m'
-
 function eecho () {
     C=$1; shift
     echo -e "$C$*$eN"
@@ -360,7 +358,7 @@
 nfsopt="vers=3,hard,intr,tcp,sync"
 
 
-while getopts ":hlotvxD:F:M:N:O:" option; do
+while getopts ":hlotvxcD:F:M:N:O:" option; do
   case $option in
     h)  # help
         cat << EOF
@@ -377,6 +375,7 @@
   -M <mnt>  mount point [$MNT]
   -N <src>  nfs source [$NFS]
   -O <opt>  nfs options [$nfsopt]
+  -c        disable color output
 
 examples:
   
@@ -402,6 +401,9 @@
     t)  # terse output
         terse=1
         ;;
+    c)  # disable color output
+        color="no"
+        ;;
     D)  # device 
         DEV="$OPTARG"
         ;;
@@ -421,13 +423,17 @@
 done
 shift $(($OPTIND - 1))
 
+if [ "$color" != "no" ]; then
+        eR='\e[31m';eG='\e[32m';eY='\e[33m';eB='\e[34m';eN='\e[0m'
+fi
+
 outdev="/dev/null"
 [ $verbose -gt 1 ] && outdev="/dev/stdout"
 errdev="/dev/null"
 [ $verbose -gt 0 ] && errdev="/dev/stderr"
 
 
-eecho $eY "Linux-VServer FS Test [V0.09] Copyright (C) 2005 H.Poetzl"
+eecho $eY "Linux-VServer FS Test [V0.10] Copyright (C) 2005 H.Poetzl"
 
 KERN=`uname -srm`
 CHCV=`chcontext --version 2>&1`
@@ -454,18 +460,30 @@
     echo "---"
     eecho $eY "testing $fs filesystem ..."
     case $fs in 
-    ext2|ext3|xfs|jfs)
+    ext2|ext3)
        mkfs.$fs $DEV 1>$outdev 2>$errdev
        rc=$?; ececho $rc "[000]"
        [ $rc -gt 0 ] && echo "($fs format failed)" && continue
        do_test "$fs" "$mntopt"
        ;;
+    xfs*)
+        mkfs.$fs -f $DEV 1>$outdev 2>$errdev
+       rc=$?; ececho $rc "[000]"
+       [ $rc -gt 0 ] && echo "($fs format failed)" && continue
+       do_test "$fs" "$mntopt"
+       ;;
     reiser*)
        mkfs.reiserfs -f $DEV 1>$outdev 2>$errdev
        rc=$?; ececho $rc "[000]"
        [ $rc -gt 0 ] && echo "(reiser format failed)" && continue
        do_test reiser "attrs,$mntopt"
        ;;
+    jfs*)
+        mkfs.jfs -q $DEV 1>$outdev 2>$errdev
+       rc=$?; ececho $rc "[000]"
+       [ $rc -gt 0 ] && echo "($fs format failed)" && continue
+       do_test "$fs" "$mntopt"
+       ;;
     nfs)
        do_test nfs "$nfsopt,$mntopt"
        ;;

signature.asc
Description: OpenPGP digital signature

_______________________________________________
Vserver mailing list
Vserver@list.linux-vserver.org
http://list.linux-vserver.org/mailman/listinfo/vserver