Log Message:
-----------
* nfs.conf: an all-NFS sample configuration.
Colorize the name of the TEST before it runs.
Support NFS branches.
Tags:
----
LKML-branch
Modified Files:
--------------
unionfs/regression-2.0:
ChangeLog (r1.1.2.18 -> r1.1.2.19)
run-tests (r1.1.2.7 -> r1.1.2.8)
Added Files:
-----------
unionfs/regression-2.0:
nfs.conf (r1.1.2.1)
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/ChangeLog,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -Lregression-2.0/ChangeLog -Lregression-2.0/ChangeLog -u -d -b -B -p
-r1.1.2.18 -r1.1.2.19
--- regression-2.0/ChangeLog
+++ regression-2.0/ChangeLog
@@ -1,8 +1,12 @@
2007-05-22 Erez Zadok <[EMAIL PROTECTED]>
+ * nfs.conf: an all-NFS sample configuration.
+
* run-tests: minor cleanup.
Don't need to see stderr from 'dd'.
Unmount the /n/lower/bN mount point not the device itself.
+ Colorize the name of the TEST before it runs.
+ Support NFS branches.
2007-05-19 Erez Zadok <[EMAIL PROTECTED]>
Index: run-tests
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/run-tests,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lregression-2.0/run-tests -Lregression-2.0/run-tests -u -d -b -B -p
-r1.1.2.7 -r1.1.2.8
--- regression-2.0/run-tests
+++ regression-2.0/run-tests
@@ -85,9 +85,23 @@ function setup_lower
;;
esac
+ case "$fs" in
+ nfs* )
+ basefs=ext2 # the base disk based f/s to export to NFS
+ runcmd mkfs -t $basefs -q $dev
+ runcmd mkdir -p /n/export/b$i
+ runcmd mount -t $basefs $dev /n/export/b$i
+ runcmd exportfs -o no_root_squash,rw localhost:/n/export/b$i
+ runcmd mkdir -p /n/lower/b$i
+ runcmd mount -t $fs localhost:/n/export/b$i /n/lower/b$i
+ ;;
+ * )
runcmd mkfs -t $fs -q $dev
runcmd mkdir -p /n/lower/b$i
runcmd mount -t $fs $dev /n/lower/b$i
+ ;;
+ esac
+
done
}
@@ -95,7 +109,17 @@ function do_umount
{
branch=$1
dev=$2
+ fs=$3
+
runcmd umount /n/lower/b$branch
+ case "$fs" in
+ nfs* )
+ runcmd exportfs -u localhost:/n/export/b$branch
+ runcmd umount /n/export/b$branch
+ ;;
+ * )
+ ;;
+ esac
case "$dev" in
/dev/loop*)
runcmd losetup -d $dev
@@ -117,7 +141,9 @@ do
test -f $t || t="t-$t.sh"
if test -f $t
then
+ test -n "$OUTPUT_COLOR" && echo -e -n "\033[${OUTPUT_COLOR}m"
echo "TEST: $t"
+ test -n "$OUTPUT_COLOR" && echo -e -n "\033[m"
else
echo "no such test script $t"
exit 1
@@ -132,7 +158,7 @@ do
# try to unmount lower file systems (check if we leak anything)
for i in 0 1 2 3 ; do
- do_umount $i $(eval echo \$DEV$i)
+ do_umount $i $(eval echo \$DEV$i) $(eval echo \$FS$i)
done
# unload unionfs module (check if we leak anything)
runcmd rmmod unionfs
--- /dev/null
+++ regression-2.0/nfs.conf
@@ -0,0 +1,92 @@
+# default Unionfs 2.0 regression configuration file
+
+# names of all possible tests
+# Note: you can give full name of test (t-chmod.sh) or short (chmod)
+ALL_TESTS="
+ t-chmod.sh
+ t-creat-open.sh
+ t-create.sh
+ t-flock.sh
+ t-fsync.sh
+ t-link-rename.sh
+ t-link.sh
+ t-lookup-opaque.sh
+ t-lookup.sh
+ t-mkdir.sh
+ t-mknod.sh
+ t-mmap.sh
+ t-open-unlink.sh
+ t-open.sh
+ t-readdir.sh
+ t-rename-matrix.sh
+ t-rename-whiteout.sh
+ t-symlink.sh
+ t-truncate-all.sh
+ t-unlink-whiteout.sh
+"
+
+# The branch-management test is "broken" and needs to be rewritten to
+# support the new remount-style -ezk.
+BROKEN_TESTS="
+ t-branchman.sh
+ t-incgen.sh
+"
+# names of tests to run (change as you like)
+# Will take $MYTESTS list of tests from the environment
+TESTS2RUN=${MYTESTS:-$ALL_TESTS}
+
+# name of four devices to use
+DEV0=/dev/loop1
+DEV1=/dev/loop2
+DEV2=/dev/loop3
+DEV3=/dev/loop4
+# name of file systems to format four device
+FS0=nfs
+FS1=nfs
+FS2=nfs
+FS3=nfs
+
+# delay between each test (in seconds, optional)
+DELAY=0
+
+# Echo the command being executed to a file/device (optional) This is useful
+# when unionfs printk's some debugging output which may go to a log file,
+# console, or syslog. With this you can show command in your logs before it
+# runs.
+#ECHODEV=/var/log/all
+ECHODEV=/dev/console
+
+# ANSI color codes, concatinated by ';'
+#
+# 00 for normal display (or just 0)
+# 01 for bold on (or just 1)
+# 02 faint (or just 2)
+# 03 standout (or just 3)
+# 04 underline (or just 4)
+# 05 blink on (or just 5)
+# 07 reverse video on (or just 7)
+# 08 nondisplayed (invisible) (or just 8)
+# 22 normal
+# 23 no-standout
+# 24 no-underline
+# 25 no-blink
+# 27 no-reverse
+# 30 black foreground
+# 31 red foreground
+# 32 green foreground
+# 33 yellow foreground
+# 34 blue foreground
+# 35 magenta foreground
+# 36 cyan foreground
+# 37 white foreground
+# 39 default foreground
+# 40 black background
+# 41 red background
+# 42 green background
+# 43 yellow background
+# 44 blue background
+# 45 magenta background
+# 46 cyan background
+# 47 white background
+# 49 default background
+OUTPUT_COLOR="1;32"
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
