From: Amir Goldstein <amir73il@gmail.com>
Date: Fri, 3 Feb 2017 11:05:37 +0000 (+0200)
Subject: generic/007: cleanup $TEST_DIR/$seq dir
X-Git-Tag: v2022.05.01~2191
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=080446d64f723d3ed2b2c0e23884cee162399802;p=xfstests-dev.git

generic/007: cleanup $TEST_DIR/$seq dir

Test generic/007 was failing after running test overlay/007,
because the latter left behind a non empty directory named 007
in test dir and the former failed to mkdir a directory with the
same name.

Cleanup $TEST_DIR/$seq both at end of overlay/007 and beginning of
generic/007 to avoid this collision.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/generic/007 b/tests/generic/007
index 88cd6ccf..cfa45541 100755
--- a/tests/generic/007
+++ b/tests/generic/007
@@ -64,6 +64,7 @@ while [ $i -le $num_filenames ]; do
   let i=$i+1
 done
 
+rm -rf $TEST_DIR/$seq
 mkdir $TEST_DIR/$seq
 cd $TEST_DIR/$seq
 $here/src/nametest -l $sourcefile -s $seed -i $iterations -z
diff --git a/tests/overlay/007 b/tests/overlay/007
index ccf2b755..ed7914b6 100755
--- a/tests/overlay/007
+++ b/tests/overlay/007
@@ -37,6 +37,7 @@ _cleanup()
 {
 	cd /
 	rm -f $tmp.*
+	rm -rf $TEST_DIR/$seq
 }
 
 # get standard environment, filters and checks