[PATCH] xfstests: make 127 and 134 clean up after themselves

[PATCH] xfstests: make 127 and 134 clean up after themselves

[Alex Elder]

Tests 127 and 134 leave temp files around when they complete.
Fix (or enable) their cleanup functions to remedy this.

Signed-off-by: Alex Elder <aelder@sgi.com>

---
 127 |    1 +
 134 |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: b/127
===================================================================
--- a/127
+++ b/127
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1
 
 _cleanup()
 {
+    rm -f $tmp.output
     _cleanup_testdir
 }
 
Index: b/134
===================================================================
--- a/134
+++ b/134
@@ -43,8 +43,7 @@ _cleanup()
 	umount $SCRATCH_MNT 2>/dev/null
 	rm -f $tmp.*
 }
-#trap "_cleanup; exit \$status" 0 1 2 3 15
-
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
 _supported_fs xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstests: make 127 and 134 clean up after themselves

[Eric Sandeen]

On 3/4/11 2:22 PM, Alex Elder wrote:
> Tests 127 and 134 leave temp files around when they complete.
> Fix (or enable) their cleanup functions to remedy this.
> 
> Signed-off-by: Alex Elder <aelder@sgi.com>

Weird, 134 had the trap commented out from the initial commit...

Reviewed-by: Eric Sandeen <sandeen@sandeen.net>

> ---
>  127 |    1 +
>  134 |    3 +--
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> Index: b/127
> ===================================================================
> --- a/127
> +++ b/127
> @@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1
>  
>  _cleanup()
>  {
> +    rm -f $tmp.output
>      _cleanup_testdir
>  }
>  
> Index: b/134
> ===================================================================
> --- a/134
> +++ b/134
> @@ -43,8 +43,7 @@ _cleanup()
>  	umount $SCRATCH_MNT 2>/dev/null
>  	rm -f $tmp.*
>  }
> -#trap "_cleanup; exit \$status" 0 1 2 3 15
> -
> +trap "_cleanup; exit \$status" 0 1 2 3 15
>  
>  # real QA test starts here
>  _supported_fs xfs
> 
> _______________________________________________
> 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