* [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable
@ 2010-09-29 14:35 Lukas Czerner
2010-09-29 14:35 ` [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*() Lukas Czerner
2010-09-29 16:18 ` [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable Eric Sandeen
0 siblings, 2 replies; 6+ messages in thread
From: Lukas Czerner @ 2010-09-29 14:35 UTC (permalink / raw)
To: xfs; +Cc: lczerner, esandeen
Use $SCRATCH_MNT variable instead of hard-coded path (/mnt/scratch) in
test 224.
---
224 | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/224 b/224
index 21be9af..00ebd2e 100644
--- a/224
+++ b/224
@@ -60,7 +60,7 @@ _scratch_mount >> $seq.full 2>&1
# set the reserved block pool to almost empty for XFS
if [ "$FSTYP" = "xfs" ]; then
- xfs_io -x -c "resblks 4" /mnt/scratch/ >> $seq.full 2>&1
+ xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seq.full 2>&1
fi
FILES=1000
--
1.7.2.3
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*()
2010-09-29 14:35 [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable Lukas Czerner
@ 2010-09-29 14:35 ` Lukas Czerner
2010-09-29 16:26 ` Eric Sandeen
2010-09-29 17:54 ` Arkadiusz Miskiewicz
2010-09-29 16:18 ` [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable Eric Sandeen
1 sibling, 2 replies; 6+ messages in thread
From: Lukas Czerner @ 2010-09-29 14:35 UTC (permalink / raw)
To: xfs; +Cc: lczerner, esandeen
Pass MKFS_OPTIONS to mkfs.$FSTYP in _scratch_mkfs_sized().
Preserve user defined MKFS_OPTIONS in _scratch_mkfs_geom().
---
common.rc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common.rc b/common.rc
index 65989c1..52b7125 100644
--- a/common.rc
+++ b/common.rc
@@ -327,7 +327,7 @@ _scratch_mkfs_sized()
_scratch_mkfs_xfs -d size=$fssize -b size=$blocksize
;;
ext2|ext3|ext4)
- /sbin/mkfs.$FSTYP -b $blocksize $SCRATCH_DEV $blocks
+ /sbin/mkfs.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
;;
*)
_notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
@@ -349,10 +349,10 @@ _scratch_mkfs_geom()
case $FSTYP in
xfs)
- MKFS_OPTIONS="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
+ MKFS_OPTIONS+="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
;;
ext4)
- MKFS_OPTIONS="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
+ MKFS_OPTIONS+="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
;;
*)
_notrun "can't mkfs $FSTYP with geometry"
--
1.7.2.3
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable
2010-09-29 14:35 [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable Lukas Czerner
2010-09-29 14:35 ` [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*() Lukas Czerner
@ 2010-09-29 16:18 ` Eric Sandeen
1 sibling, 0 replies; 6+ messages in thread
From: Eric Sandeen @ 2010-09-29 16:18 UTC (permalink / raw)
To: Lukas Czerner; +Cc: esandeen, xfs
Lukas Czerner wrote:
> Use $SCRATCH_MNT variable instead of hard-coded path (/mnt/scratch) in
> test 224.
heh, whoops!
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
I'll commit it.
> ---
> 224 | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/224 b/224
> index 21be9af..00ebd2e 100644
> --- a/224
> +++ b/224
> @@ -60,7 +60,7 @@ _scratch_mount >> $seq.full 2>&1
>
> # set the reserved block pool to almost empty for XFS
> if [ "$FSTYP" = "xfs" ]; then
> - xfs_io -x -c "resblks 4" /mnt/scratch/ >> $seq.full 2>&1
> + xfs_io -x -c "resblks 4" $SCRATCH_MNT >> $seq.full 2>&1
> fi
>
> FILES=1000
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*()
2010-09-29 14:35 ` [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*() Lukas Czerner
@ 2010-09-29 16:26 ` Eric Sandeen
2010-09-29 17:54 ` Arkadiusz Miskiewicz
1 sibling, 0 replies; 6+ messages in thread
From: Eric Sandeen @ 2010-09-29 16:26 UTC (permalink / raw)
To: Lukas Czerner; +Cc: esandeen, xfs
Lukas Czerner wrote:
> Pass MKFS_OPTIONS to mkfs.$FSTYP in _scratch_mkfs_sized().
> Preserve user defined MKFS_OPTIONS in _scratch_mkfs_geom().
> ---
thanks, this looks good too. both are committed now.
-Eric
> common.rc | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/common.rc b/common.rc
> index 65989c1..52b7125 100644
> --- a/common.rc
> +++ b/common.rc
> @@ -327,7 +327,7 @@ _scratch_mkfs_sized()
> _scratch_mkfs_xfs -d size=$fssize -b size=$blocksize
> ;;
> ext2|ext3|ext4)
> - /sbin/mkfs.$FSTYP -b $blocksize $SCRATCH_DEV $blocks
> + /sbin/mkfs.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
> ;;
> *)
> _notrun "Filesystem $FSTYP not supported in _scratch_mkfs_sized"
> @@ -349,10 +349,10 @@ _scratch_mkfs_geom()
>
> case $FSTYP in
> xfs)
> - MKFS_OPTIONS="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
> + MKFS_OPTIONS+="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
> ;;
> ext4)
> - MKFS_OPTIONS="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
> + MKFS_OPTIONS+="-b $blocksize -E stride=$sunit_blocks,stripe_width=$swidth_blocks"
> ;;
> *)
> _notrun "can't mkfs $FSTYP with geometry"
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*()
2010-09-29 14:35 ` [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*() Lukas Czerner
2010-09-29 16:26 ` Eric Sandeen
@ 2010-09-29 17:54 ` Arkadiusz Miskiewicz
2010-09-29 23:24 ` Dave Chinner
1 sibling, 1 reply; 6+ messages in thread
From: Arkadiusz Miskiewicz @ 2010-09-29 17:54 UTC (permalink / raw)
To: xfs
On Wednesday 29 of September 2010, Lukas Czerner wrote:
> Pass MKFS_OPTIONS to mkfs.$FSTYP in _scratch_mkfs_sized().
> Preserve user defined MKFS_OPTIONS in _scratch_mkfs_geom().
> ---
> common.rc | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/common.rc b/common.rc
[...]
> case $FSTYP in
> xfs)
> - MKFS_OPTIONS="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
> + MKFS_OPTIONS+="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
common.rc uses /bin/sh and += notation is a bashizm. Won't work on strict
posix shells.
--
Arkadiusz Miśkiewicz PLD/Linux Team
arekm / maven.pl http://ftp.pld-linux.org/
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*()
2010-09-29 17:54 ` Arkadiusz Miskiewicz
@ 2010-09-29 23:24 ` Dave Chinner
0 siblings, 0 replies; 6+ messages in thread
From: Dave Chinner @ 2010-09-29 23:24 UTC (permalink / raw)
To: Arkadiusz Miskiewicz; +Cc: xfs
On Wed, Sep 29, 2010 at 07:54:32PM +0200, Arkadiusz Miskiewicz wrote:
> On Wednesday 29 of September 2010, Lukas Czerner wrote:
> > Pass MKFS_OPTIONS to mkfs.$FSTYP in _scratch_mkfs_sized().
> > Preserve user defined MKFS_OPTIONS in _scratch_mkfs_geom().
> > ---
> > common.rc | 6 +++---
> > 1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/common.rc b/common.rc
> [...]
> > case $FSTYP in
> > xfs)
> > - MKFS_OPTIONS="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
> > + MKFS_OPTIONS+="-b size=$blocksize, -d su=$sunit_bytes,sw=$swidth_mult"
>
> common.rc uses /bin/sh and += notation is a bashizm. Won't work on strict
> posix shells.
We've converted all of xfstests to use bash rather than bin/sh because of
all the bashisms in the code, so this is fine.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-29 23:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-29 14:35 [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable Lukas Czerner
2010-09-29 14:35 ` [PATCH 2/2] xfstests: Use $MKFS_OPTIONS in _scratch_mkfs_*() Lukas Czerner
2010-09-29 16:26 ` Eric Sandeen
2010-09-29 17:54 ` Arkadiusz Miskiewicz
2010-09-29 23:24 ` Dave Chinner
2010-09-29 16:18 ` [PATCH 1/2] xfstests 224: Use $SCRATCH_MNT variable Eric Sandeen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox