Skip to contentSkip to conversation

xfstests: more simple fixes...

PATCH Superseded Dave Chinner 3 participants 7 messages May 8, 2013 – May 14, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover xfstests: more simple fixes...

A couple of simple fixes - another redirection issue that I missed on the last sweep (thanks Michael!), and a patch that disables quota tests on relatime filesystems as realtime filesystems don't support quotas.

Cheers,

Dave.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw

PATCH 1/2 xfstests: fix incorrect redirect in generic/233

From: Dave Chinner <[email protected]>

generic/233 attempts to direct output to tee, but instead of using a pipe it uses an append operator. Hence it leaves a file named "tee" in the root directory of the xfstests execution path. Just direct the output to the $seqres.full file rather than trying to tee it into the test output as well.

---
 tests/generic/233 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/generic/233 +1 -1
index 2b6cd2f..58b3672 100755
@@ -62,7 +62,7 @@ _fsstress()
 -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
 -n $count -d $out -p 7`
 
-	echo "fsstress $args" >> tee -a $seqres.full
+	echo "fsstress $args" >> $seqres.full
 	if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $seqres.full | _filter_num
 	then
 		echo "    fsstress $args returned $?"
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] xfstests: fix incorrect redirect in generic/233

Quoted 10 lines · Dave Chinner

From: Dave Chinner <[email protected]>

generic/233 attempts to direct output to tee, but instead of using a pipe it uses an append operator. Hence it leaves a file named "tee" in the root directory of the xfstests execution path. Just direct the output to the $seqres.full file rather than trying to tee it into the test output as well.

Quoted 10 lines
---
 tests/generic/233 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/generic/233 +0 -0
index 2b6cd2f..58b3672 100755

tests/generic/233 _fsstress() · line 68

Quoted 8 lines
tests/generic/233 +1 -1
@@ -62,7 +62,7 @@ _fsstress()
 -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 \
 -n $count -d $out -p 7`
 
-	echo "fsstress $args" >> tee -a $seqres.full
+	echo "fsstress $args" >> $seqres.full
 	if ! su $qa_user -c "$FSSTRESS_PROG $args" | tee -a $seqres.full | _filter_num
 	then
 		echo "    fsstress $args returned $?"

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#3 lore raw

Re: [PATCH 1/2] xfstests: fix incorrect redirect in generic/233

In reply to Dave Chinner
Quoted 8 lines · Dave Chinner

From: Dave Chinner <[email protected]>

generic/233 attempts to direct output to tee, but instead of using a pipe it uses an append operator. Hence it leaves a file named "tee" in the root directory of the xfstests execution path. Just direct the output to the $seqres.full file rather than trying to tee it into the test output as well.

This patch has been committed:

commit ef6b44446143e7bea4ef17b4493e23ca1cdb64b2

Author: Dave Chinner <[email protected]>
Date:   Tue May 14 08:34:44 2013 -0500

xfstests: fix incorrect redirect in generic/233

Thanks
--Rich

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#4 lore raw

PATCH 2/2 xfstests: quota not supported on realtime filesystems

In reply to Dave Chinner

From: Dave Chinner <[email protected]>

Realtime XFS filesystems do not support quotas, so quota tests always fail on such filesystems. Add a check to _require_quota to detect this situation and notrun the quota tests...

---
 common/quota |    6 ++++++
 1 file changed, 6 insertions(+)
common/quota +6 -0
index fd5374f..3550cd4 100644
@@ -40,6 +40,12 @@ _require_quota()
 	if [ ! -f /proc/fs/xfs/xqmstat ]; then
 	    _notrun "Installed kernel does not support XFS quotas"
         fi
+	if [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_RTDEV" ]; then
+	    _notrun "Quotas not supported on realtime test device"
+	fi
+	if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ]; then
+	    _notrun "Quotas not supported on realtime scratch device"
+	fi
 	;;
     *)
 	_notrun "disk quotas not supported by this filesystem type: $FSTYP"
Signature · 6 lines
1.7.10.4

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Reviewed-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] xfstests: quota not supported on realtime filesystems

Quoted 7 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Realtime XFS filesystems do not support quotas, so quota tests always fail on such filesystems. Add a check to _require_quota to detect this situation and notrun the quota tests...

(PS why is USE_EXTERNAL a thing? if it's set, shouldn't it be used?)

-Eric

Quoted 12 lines
---
 common/quota |    6 ++++++
 1 file changed, 6 insertions(+)
common/quota +0 -0
index fd5374f..3550cd4 100644
@@ -40,6 +40,12 @@ _require_quota()
 	if [ ! -f /proc/fs/xfs/xqmstat ]; then
 	    _notrun "Installed kernel does not support XFS quotas"

common/quota _require_quota() · line 51

Quoted 10 lines
common/quota +6 -0
         fi
+	if [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_RTDEV" ]; then
+	    _notrun "Quotas not supported on realtime test device"
+	fi
+	if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ]; then
+	    _notrun "Quotas not supported on realtime scratch device"
+	fi
 	;;
     *)
 	_notrun "disk quotas not supported by this filesystem type: $FSTYP"

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#6 lore raw

Re: [PATCH 2/2] xfstests: quota not supported on realtime filesystems

Quoted 7 lines · Eric Sandeen
Quoted 6 lines · Dave Chinner

From: Dave Chinner <[email protected]>

Realtime XFS filesystems do not support quotas, so quota tests always fail on such filesystems. Add a check to _require_quota to detect this situation and notrun the quota tests...

Quoted 5 lines
Quoted 1 line

(PS why is USE_EXTERNAL a thing? if it's set, shouldn't it be used?)

Because if you have rtdev/logdev defined in your config, you can choose whether to test them or not without having to modify the config file. Very handy, really.

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs