From 9b07caada655bd98f233f96066b2e7f4b916f4a4 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Wed, 16 Feb 2022 14:00:00 -0500
Subject: [PATCH] setup-testdirs.zsh: Empty directories before running tests

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
 setup-testdirs.zsh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/setup-testdirs.zsh b/setup-testdirs.zsh
index 34a34f2..0b9f769 100755
--- a/setup-testdirs.zsh
+++ b/setup-testdirs.zsh
@@ -10,15 +10,17 @@ if [ "$#" -lt 4 ]; then
 fi
 
 mkdir -p $MOUNTPOINT
-
-TRAPEXIT() {
-	umount $MOUNTPOINT
-}
-
 mount -o sec=sys $SERVER:$EXPORT $MOUNTPOINT
 
 for proto in tcp rdma; do
 	for vers in 3 4 41 42; do
-		mkdir -p -m 777 $MOUNTPOINT/$USER/nfsv$vers$proto
+		dir=$MOUNTPOINT/$USER/nfsv$vers$proto
+		if [ ! -d $dir ]; then
+			mkdir -p -m 777 $dir
+		elif [ "$(ls -A $dir)" ]; then
+			rm -rf $dir/* || true
+		fi
 	done
 done
+
+umount -f $MOUNTPOINT