* [PATCH] xfstests: small common.config cleanup
@ 2009-06-20 17:38 Christoph Hellwig
2009-07-07 10:33 ` Christoph Hellwig
2009-07-07 14:05 ` Eric Sandeen
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Hellwig @ 2009-06-20 17:38 UTC (permalink / raw)
To: xfs
Don't list various non-mandatory options near the check for the
mandatory ones, and make the test for the mandatory ones a proper if
statements.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: xfstests-dev/common.config
===================================================================
--- xfstests-dev.orig/common.config 2009-06-20 19:15:14.576805079 +0200
+++ xfstests-dev/common.config 2009-06-20 19:16:48.956930262 +0200
@@ -191,27 +191,18 @@ known_hosts()
[ -f $HOST_CONFIG_DIR/$HOST ] && . $HOST_CONFIG_DIR/$HOST
[ -f $HOST_CONFIG_DIR/$HOST.config ] && . $HOST_CONFIG_DIR/$HOST.config
+ # Mandatory Config values.
MC=""
-# Non-Mandatory Config values.
-# [ -z "$MODULAR" ] && MC="$MC MODULAR"
-# [ -z "$TEST_LOGDEV" ] && MC="$MC TEST_LOGDEV"
-# [ -z "$SCRATCH_LOGDEV" ] && MC="$MC SCRATCH_LOGDEV"
-# [ -z "$SCRATCH_RTDEV" ] && MC="$MC SCRATCH_RTDEV"
-# [ -z "$SCRATCH_MNT" ] && MC="$MC SCRATCH_MNT"
-# [ -z "$SCRATCH_DEV" ] && MC="$MC SCRATCH_DEV"
-
[ -z "$EMAIL" ] && MC="$MC EMAIL"
[ -z "$TEST_DIR" ] && MC="$MC TEST_DIR"
[ -z "$TEST_DEV" ] && MC="$MC TEST_DEV"
- [ "$MC" ] && (echo "Warning: need to define parameters for host $HOST";\
- echo " or set variables:"; \
- echo " $MC")
-# if [ -e configs/$HOST.config ]
-# then echo "Not carring, we have a configfile ($HOST_CONFIG_DIR/$HOST)"
-# else
- [ "$MC" ] && exit 1
-# fi
+ if [ -n "$MC" ]; then
+ echo "Warning: need to define parameters for host $HOST"
+ echo " or set variables:"
+ echo " $MC"
+ exit 1
+ fi
}
if [ -f "$HOST_OPTIONS" ]; then
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xfstests: small common.config cleanup
2009-06-20 17:38 [PATCH] xfstests: small common.config cleanup Christoph Hellwig
@ 2009-07-07 10:33 ` Christoph Hellwig
2009-07-07 14:05 ` Eric Sandeen
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2009-07-07 10:33 UTC (permalink / raw)
To: xfs
ping?
On Sat, Jun 20, 2009 at 01:38:18PM -0400, Christoph Hellwig wrote:
> Don't list various non-mandatory options near the check for the
> mandatory ones, and make the test for the mandatory ones a proper if
> statements.
>
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Index: xfstests-dev/common.config
> ===================================================================
> --- xfstests-dev.orig/common.config 2009-06-20 19:15:14.576805079 +0200
> +++ xfstests-dev/common.config 2009-06-20 19:16:48.956930262 +0200
> @@ -191,27 +191,18 @@ known_hosts()
> [ -f $HOST_CONFIG_DIR/$HOST ] && . $HOST_CONFIG_DIR/$HOST
> [ -f $HOST_CONFIG_DIR/$HOST.config ] && . $HOST_CONFIG_DIR/$HOST.config
>
> + # Mandatory Config values.
> MC=""
> -# Non-Mandatory Config values.
> -# [ -z "$MODULAR" ] && MC="$MC MODULAR"
> -# [ -z "$TEST_LOGDEV" ] && MC="$MC TEST_LOGDEV"
> -# [ -z "$SCRATCH_LOGDEV" ] && MC="$MC SCRATCH_LOGDEV"
> -# [ -z "$SCRATCH_RTDEV" ] && MC="$MC SCRATCH_RTDEV"
> -# [ -z "$SCRATCH_MNT" ] && MC="$MC SCRATCH_MNT"
> -# [ -z "$SCRATCH_DEV" ] && MC="$MC SCRATCH_DEV"
> -
> [ -z "$EMAIL" ] && MC="$MC EMAIL"
> [ -z "$TEST_DIR" ] && MC="$MC TEST_DIR"
> [ -z "$TEST_DEV" ] && MC="$MC TEST_DEV"
>
> - [ "$MC" ] && (echo "Warning: need to define parameters for host $HOST";\
> - echo " or set variables:"; \
> - echo " $MC")
> -# if [ -e configs/$HOST.config ]
> -# then echo "Not carring, we have a configfile ($HOST_CONFIG_DIR/$HOST)"
> -# else
> - [ "$MC" ] && exit 1
> -# fi
> + if [ -n "$MC" ]; then
> + echo "Warning: need to define parameters for host $HOST"
> + echo " or set variables:"
> + echo " $MC"
> + exit 1
> + fi
> }
>
> if [ -f "$HOST_OPTIONS" ]; then
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xfstests: small common.config cleanup
2009-06-20 17:38 [PATCH] xfstests: small common.config cleanup Christoph Hellwig
2009-07-07 10:33 ` Christoph Hellwig
@ 2009-07-07 14:05 ` Eric Sandeen
1 sibling, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2009-07-07 14:05 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs
Christoph Hellwig wrote:
> Don't list various non-mandatory options near the check for the
> mandatory ones, and make the test for the mandatory ones a proper if
> statements.
>
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok to me:
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
> Index: xfstests-dev/common.config
> ===================================================================
> --- xfstests-dev.orig/common.config 2009-06-20 19:15:14.576805079 +0200
> +++ xfstests-dev/common.config 2009-06-20 19:16:48.956930262 +0200
> @@ -191,27 +191,18 @@ known_hosts()
> [ -f $HOST_CONFIG_DIR/$HOST ] && . $HOST_CONFIG_DIR/$HOST
> [ -f $HOST_CONFIG_DIR/$HOST.config ] && . $HOST_CONFIG_DIR/$HOST.config
>
> + # Mandatory Config values.
> MC=""
> -# Non-Mandatory Config values.
> -# [ -z "$MODULAR" ] && MC="$MC MODULAR"
> -# [ -z "$TEST_LOGDEV" ] && MC="$MC TEST_LOGDEV"
> -# [ -z "$SCRATCH_LOGDEV" ] && MC="$MC SCRATCH_LOGDEV"
> -# [ -z "$SCRATCH_RTDEV" ] && MC="$MC SCRATCH_RTDEV"
> -# [ -z "$SCRATCH_MNT" ] && MC="$MC SCRATCH_MNT"
> -# [ -z "$SCRATCH_DEV" ] && MC="$MC SCRATCH_DEV"
> -
> [ -z "$EMAIL" ] && MC="$MC EMAIL"
> [ -z "$TEST_DIR" ] && MC="$MC TEST_DIR"
> [ -z "$TEST_DEV" ] && MC="$MC TEST_DEV"
>
> - [ "$MC" ] && (echo "Warning: need to define parameters for host $HOST";\
> - echo " or set variables:"; \
> - echo " $MC")
> -# if [ -e configs/$HOST.config ]
> -# then echo "Not carring, we have a configfile ($HOST_CONFIG_DIR/$HOST)"
> -# else
> - [ "$MC" ] && exit 1
> -# fi
> + if [ -n "$MC" ]; then
> + echo "Warning: need to define parameters for host $HOST"
> + echo " or set variables:"
> + echo " $MC"
> + exit 1
> + fi
> }
>
> if [ -f "$HOST_OPTIONS" ]; then
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-07-07 14:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-20 17:38 [PATCH] xfstests: small common.config cleanup Christoph Hellwig
2009-07-07 10:33 ` Christoph Hellwig
2009-07-07 14:05 ` Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox