From f812bb30c6b21f1d485e384a4302b04fdbbad8b4 Mon Sep 17 00:00:00 2001 From: Erez_Zadok Date: Mon, 9 Jul 2007 19:55:24 -0400 Subject: [PATCH] Merge jffs2 test into default.conf, so we don't need a separate conf file Signed-off-by: Erez Zadok --- brm.conf | 20 ++++++++--- default.conf | 21 +++++++++--- jffs2.conf | 96 ---------------------------------------------------- thor.conf | 21 +++++++++--- 4 files changed, 48 insertions(+), 110 deletions(-) delete mode 100644 jffs2.conf diff --git a/brm.conf b/brm.conf index 1b1d2bf..2a0b8da 100644 --- a/brm.conf +++ b/brm.conf @@ -40,12 +40,24 @@ 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=ext2 -FS1=ext2 -FS2=ext2 -FS3=ext2 +case ${MYFS} in + # jffs2 is special: only the leftmost filesystem uses it + jffs* ) + FS0=${MYFS} + FS1=ext2 + FS2=ext2 + FS3=ext2 + ;; + * ) + FS0=${MYFS} + FS1=${MYFS} + FS2=${MYFS} + FS3=${MYFS} + ;; +esac # delay between each test (in seconds, optional) DELAY=1 diff --git a/default.conf b/default.conf index 0863ebd..66232f5 100644 --- a/default.conf +++ b/default.conf @@ -42,13 +42,24 @@ DEV0=/dev/loop0 DEV1=/dev/loop1 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=$myfs -FS1=$myfs -FS2=$myfs -FS3=$myfs +case ${MYFS} in + # jffs2 is special: only the leftmost filesystem uses it + jffs* ) + FS0=${MYFS} + FS1=ext2 + FS2=ext2 + FS3=ext2 + ;; + * ) + FS0=${MYFS} + FS1=${MYFS} + FS2=${MYFS} + FS3=${MYFS} + ;; +esac # delay between each test (in seconds or fractions thereof, optional) DELAY=0.5 diff --git a/jffs2.conf b/jffs2.conf deleted file mode 100644 index 03d4c4f..0000000 --- a/jffs2.conf +++ /dev/null @@ -1,96 +0,0 @@ -# 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) -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/loop0 -DEV1=/dev/loop1 -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=$myfs -FS2=$myfs -FS3=$myfs - -# 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, -# 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" diff --git a/thor.conf b/thor.conf index 4086b13..775488d 100644 --- a/thor.conf +++ b/thor.conf @@ -41,13 +41,24 @@ DEV0=/dev/.static/dev/loop0 DEV1=/dev/.static/dev/loop1 DEV2=/dev/.static/dev/loop2 DEV3=/dev/.static/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=$myfs -FS1=$myfs -FS2=$myfs -FS3=$myfs +case ${MYFS} in + # jffs2 is special: only the leftmost filesystem uses it + jffs* ) + FS0=${MYFS} + FS1=ext2 + FS2=ext2 + FS3=ext2 + ;; + * ) + FS0=${MYFS} + FS1=${MYFS} + FS2=${MYFS} + FS3=${MYFS} + ;; +esac # delay between each test (in seconds, optional) DELAY=0.125 -- 2.43.0