Log Message:
-----------
* run-tests: show lower file system being used.

* run-all-tests: simple wrapper script to run all regression tests
on all known working lower file systems.

* default.conf (MYFS): allow overriding the default ext2 lower
file system to something else.

* README: document how to override default lower file system (env
var $MYFS)

Tags:
----
LKML-branch

Modified Files:
--------------
    unionfs/regression-2.0:
        ChangeLog (r1.1.2.30 -> r1.1.2.31)
        README (r1.1.2.5 -> r1.1.2.6)
        default.conf (r1.1.2.8 -> r1.1.2.9)
        jffs2.conf (r1.1.2.4 -> r1.1.2.5)
        run-tests (r1.1.2.15 -> r1.1.2.16)

Added Files:
-----------
    unionfs/regression-2.0:
        run-all-tests (r1.1.2.1)

Removed Files:
-------------
    unionfs/regression-2.0:
        nfs.conf

Revision Data
-------------
--- /dev/null
+++ regression-2.0/run-all-tests
@@ -0,0 +1,15 @@
+#!/bin/sh
+# run all unionfs regression tests
+
+# support for nfs4 isn't ready yet
+LIST="ext2 ext3 xfs reiserfs nfs2 nfs3"
+
+for fs in $LIST
+do
+       echo "Running $fs tests..."
+       sleep 1
+       MYFS=$fs ./run-tests default || exit $?
+done
+
+# jffs2 is a special test, as jffs2 is used only as the leftmost branch
+./run-tests jffs2 || exit $?
Index: default.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/default.conf,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lregression-2.0/default.conf -Lregression-2.0/default.conf -u -d -b -B -p 
-r1.1.2.8 -r1.1.2.9
--- regression-2.0/default.conf
+++ regression-2.0/default.conf
@@ -1,4 +1,5 @@
 # default Unionfs 2.0 regression configuration file
+# uses ext2 by default, which you can override using a $MYFS env var
 
 # names of all possible tests
 # Note: you can give full name of test (t-chmod.sh) or short (chmod)
@@ -43,13 +44,14 @@ DEV2=/dev/loop2
 DEV3=/dev/loop3
 # Name of file systems to format your device.  Supported file systems
 # include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
-FS0=ext2
-FS1=ext2
-FS2=ext2
-FS3=ext2
+myfs=${MYFS:-ext2}
+FS0=$myfs
+FS1=$myfs
+FS2=$myfs
+FS3=$myfs
 
-# delay between each test (in seconds, optional)
-DELAY=1
+# delay between each test (in seconds or fractions thereof, optional)
+DELAY=0.5
 
 # 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,
Index: ChangeLog
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/ChangeLog,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -Lregression-2.0/ChangeLog -Lregression-2.0/ChangeLog -u -d -b -B -p 
-r1.1.2.30 -r1.1.2.31
--- regression-2.0/ChangeLog
+++ regression-2.0/ChangeLog
@@ -1,3 +1,16 @@
+2007-06-05  Erez Zadok  <[EMAIL PROTECTED]>
+
+       * run-tests: show lower file system being used.
+
+       * run-all-tests: simple wrapper script to run all regression tests
+       on all known working lower file systems.
+
+       * default.conf (MYFS): allow overriding the default ext2 lower
+       file system to something else.
+
+       * README: document how to override default lower file system (env
+       var $MYFS)
+
 2007-05-30  Erez Zadok  <[EMAIL PROTECTED]>
 
        * *.conf (ALL_TESTS): support new ioctl test.
Index: run-tests
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/run-tests,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -Lregression-2.0/run-tests -Lregression-2.0/run-tests -u -d -b -B -p 
-r1.1.2.15 -r1.1.2.16
--- regression-2.0/run-tests
+++ regression-2.0/run-tests
@@ -195,7 +195,7 @@ do
   if test -f $t
   then
       test -n "$OUTPUT_COLOR" && echo -e -n "\033[${OUTPUT_COLOR}m"
-      echo "TEST: $t"
+      echo "TEST: $t (FS=${MYFS:-default})"
       test -n "$OUTPUT_COLOR" && echo -e -n "\033[m"
   else
       echo "no such test script $t"
Index: jffs2.conf
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/jffs2.conf,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lregression-2.0/jffs2.conf -Lregression-2.0/jffs2.conf -u -d -b -B -p 
-r1.1.2.4 -r1.1.2.5
--- regression-2.0/jffs2.conf
+++ regression-2.0/jffs2.conf
@@ -1,4 +1,5 @@
 # default Unionfs 2.0 regression configuration file
+# uses ext2 by default, which you can override using a $MYFS env var
 
 # names of all possible tests
 # Note: you can give full name of test (t-chmod.sh) or short (chmod)
@@ -43,13 +44,14 @@ DEV2=/dev/loop2
 DEV3=/dev/loop3
 # Name of file systems to format your device.  Supported file systems
 # include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
+myfs=${MYFS:-ext2}
 FS0=jffs2
-FS1=ext2
-FS2=ext2
-FS3=ext2
+FS1=$myfs
+FS2=$myfs
+FS3=$myfs
 
-# delay between each test (in seconds, optional)
-DELAY=1
+# delay between each test (in seconds or fractions thereof, optional)
+DELAY=0.5
 
 # 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,
--- regression-2.0/nfs.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-ioctl.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 your device.  Supported file systems
-# include: ext2, ext3, xfs, reiserfs, nfs, nfs2, nfs3, nfs4, and jffs2.
-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, concatenated 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"
Index: README
===================================================================
RCS file: /home/cvs/unionfs/unionfs/regression-2.0/Attic/README,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lregression-2.0/README -Lregression-2.0/README -u -d -b -B -p -r1.1.2.5 
-r1.1.2.6
--- regression-2.0/README
+++ regression-2.0/README
@@ -22,7 +22,7 @@ To run all the tests, execute
 
 which will read the configuration file default.conf.  This configuration
 file defines the tests to run, devices to format and their respective file
-systems, and two optional features:
+systems, and three optional features:
 
 1. A delay to sleep before each critical action which may reveal a bug.
 
@@ -30,6 +30,11 @@ systems, and two optional features:
    executed to.  This is useful of you have a lot of debugging printk's from
    inside the kernel, so you can tell which printk's below to which action.
 
+3. you can change the default file system used as the lower file system from
+   ext2 to anything else, for example as follows:
+
+# MYFS=nfs3 ./run-tests default
+
 It's recommend that you don't change default.conf.  Instead, copy it to
 something like "mytests.conf" and then run
 
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs

Reply via email to