From: Dave Chinner <david@fromorbit.com>
To: fstests@vger.kernel.org
Subject: [PATCH 2/3] setup: add section support
Date: Thu, 21 Jan 2016 12:43:12 +1100 [thread overview]
Message-ID: <1453340593-10236-3-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1453340593-10236-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
Make the setup command section aware so that it is easy to test
whether the section config code is generating the correct
configurations or not.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
setup | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 47 insertions(+), 6 deletions(-)
diff --git a/setup b/setup
index eb7bdb3..1a41d81 100755
--- a/setup
+++ b/setup
@@ -15,22 +15,63 @@
# along with this program; if not, write the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+usage()
+{
+
+ echo "Usage: $0 [options]"'
+
+ -s section run only specified section(s) from config file
+'
+ exit 0
+}
+
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -\? | -h | --help) usage ;;
+ -s) RUN_SECTION="$RUN_SECTION $2"; shift ;;
+ *) usage ;;
+ esac
+ shift
+done
+
if ! . ./common/config
then
echo "check: failed to source common/config"
exit 1
fi
-[ "$USE_EXTERNAL" = yes ] || USE_EXTERNAL=no
-[ "$USE_LBD_PATCH" = yes ] || USE_LBD_PATCH=no
-[ "$LARGE_SCRATCH_DEV" = yes ] || LARGE_SCRATCH_DEV=no
-[ "$USE_ATTR_SECURE" = yes ] || USE_ATTR_SECURE=no
-[ -z "$FSTYP" ] && FSTYP="xfs"
+for section in $HOST_OPTIONS_SECTIONS; do
+ OLD_FSTYP=$FSTYP
+ OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS
+ get_next_config $section
+
+ # Do we need to run only some sections ?
+ if [ ! -z "$RUN_SECTION" ]; then
+ skip=true
+ for s in $RUN_SECTION; do
+ if [ $section == $s ]; then
+ skip=false
+ fi
+ done
+ if $skip; then
+ continue
+ fi
+ fi
+
+ [ "$USE_EXTERNAL" = yes ] || USE_EXTERNAL=no
+ [ "$USE_LBD_PATCH" = yes ] || USE_LBD_PATCH=no
+ [ "$LARGE_SCRATCH_DEV" = yes ] || LARGE_SCRATCH_DEV=no
+ [ "$USE_ATTR_SECURE" = yes ] || USE_ATTR_SECURE=no
+ [ -z "$FSTYP" ] && FSTYP="xfs"
+
+ cat <<EOF
+SECTION -- $section
-cat <<EOF
TEST: DIR=$TEST_DIR DEV=$TEST_DEV rt=[$TEST_RTDEV] log=[$TEST_LOGDEV]
TAPE: dev=[$TAPE_DEV] rmt=[$RMT_TAPE_DEV] rmtirix=[$RMT_TAPE_USER@$RMT_IRIXTAPE_DEV]
SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]
VARIABLES: external=$USE_EXTERNAL largeblk=$USE_LBD_PATCH fstyp=$FSTYP
large_scratch_dev=$LARGE_SCRATCH_DEV attrsecure=$USE_ATTR_SECURE
+--------
EOF
+done
--
2.5.0
next prev parent reply other threads:[~2016-01-21 1:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-21 1:43 [PATCH 0/3] fstests: improved config section support Dave Chinner
2016-01-21 1:43 ` [PATCH 1/3] xfs: support realtime/log device setup changes in config sections Dave Chinner
2016-02-02 4:36 ` Eryu Guan
2016-02-04 21:04 ` Dave Chinner
2016-02-05 2:46 ` Eryu Guan
2016-01-21 1:43 ` Dave Chinner [this message]
2016-02-05 3:33 ` [PATCH 2/3] setup: add section support Eryu Guan
2016-01-21 1:43 ` [PATCH 3/3] check: add exclude sections CLI parameter Dave Chinner
2016-02-02 3:34 ` [PATCH 0/3] fstests: improved config section support Dave Chinner
2016-02-04 21:06 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453340593-10236-3-git-send-email-david@fromorbit.com \
--to=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox