From 9f54c866ed67f2992f5b3f479d80440cf93cfff9 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Fri, 10 Dec 2021 17:28:51 -0500
Subject: [PATCH] setup-testdirs.zsh: Combine with parts of
 setup-{cthon,xfstests}.zsh

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
 cthon.zsh           |  2 +-
 install-scripts.zsh |  2 +-
 setup-cthon.zsh     | 18 ------------------
 setup-testdirs.zsh  | 27 ++++++++++++++++++++-------
 setup-xfstests.zsh  | 15 ++-------------
 5 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100755 setup-cthon.zsh

diff --git a/cthon.zsh b/cthon.zsh
index 932ea3f..d1c422e 100755
--- a/cthon.zsh
+++ b/cthon.zsh
@@ -34,7 +34,7 @@ if [ ${#KRB5} -gt 0 ]; then
 	RUN_CTHON="$RUN_CTHON --dokrb5"
 fi
 
-ssh ${CLIENT[-1]} "sudo setup-cthon.zsh ${SERVER[-1]} ${EXPORT[-1]} ${MOUNTPOINT[-1]} $USER" | python -u $COLOR
+ssh ${CLIENT[-1]} "sudo setup-testdirs.zsh ${SERVER[-1]} ${EXPORT[-1]} ${MOUNTPOINT[-1]} $USER" | python $COLOR
 echo
 
 #
diff --git a/install-scripts.zsh b/install-scripts.zsh
index 93e922e..cd9fd1a 100755
--- a/install-scripts.zsh
+++ b/install-scripts.zsh
@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 BIN=$HOME/bin
-SCRIPTS=(grub-list.zsh setup-testdirs.zsh setup-cthon.zsh \
+SCRIPTS=(grub-list.zsh setup-testdirs.zsh \
 	 setup-xfstests.zsh run-xfstests.zsh)
 
 function install_script() {
diff --git a/setup-cthon.zsh b/setup-cthon.zsh
deleted file mode 100755
index 9655cf9..0000000
--- a/setup-cthon.zsh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/zsh
-SERVER=$1
-EXPORT=$2
-MOUNTPOINT=$3
-USER=$4
-
-if [ "$#" -lt 4 ]; then
-	echo "Usage: $0 {server} {export} {mountpoint} {user}"
-	exit 1
-fi
-
-TRAPEXIT() {
-	umount $MOUNTPOINT
-}
-
-mkdir -p $MOUNTPOINT
-mount -o sec=sys $SERVER:$EXPORT $MOUNTPOINT
-/home/$USER/bin/setup-testdirs.zsh $MOUNTPOINT/$USER
diff --git a/setup-testdirs.zsh b/setup-testdirs.zsh
index f20dcba..34a34f2 100755
--- a/setup-testdirs.zsh
+++ b/setup-testdirs.zsh
@@ -1,11 +1,24 @@
 #!/bin/zsh
-PARENT=$1
+SERVER=$1
+EXPORT=$2
+MOUNTPOINT=$3
+USER=$4
 
-function mkdirs() {
-	for vers in 3 4 41 42; do
-		mkdir -p -m 777 $PARENT/nfsv$vers$1
-	done
+if [ "$#" -lt 4 ]; then
+	echo "Usage: $0 {server} {export} {mountpoint} {user}"
+	exit 1
+fi
+
+mkdir -p $MOUNTPOINT
+
+TRAPEXIT() {
+	umount $MOUNTPOINT
 }
 
-mkdirs tcp
-mkdirs rdma
+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
+	done
+done
diff --git a/setup-xfstests.zsh b/setup-xfstests.zsh
index ab964ee..94105b4 100755
--- a/setup-xfstests.zsh
+++ b/setup-xfstests.zsh
@@ -16,16 +16,5 @@ groupadd fsgqa 2>/dev/null
 useradd --badnames 123456-fsgqa 2>/dev/null
 useradd fsgqa2 2>/dev/null
 
-TRAPEXIT() {
-	umount $MOUNTPOINT
-	umount $SCRATCHMNT
-}
-
-mkdir -p $MOUNTPOINT
-mkdir -p $SCRATCHMNT
-
-mount -o sec=sys $SERVER:$EXPORT $MOUNTPOINT
-mount -o sec=sys $SERVER:$SCRATCH $SCRATCHMNT
-
-mkdir -p -m 777 $MOUNTPOINT/$USER/xfstests
-mkdir -p -m 777 $SCRATCHMNT/$USER/xfstests
+setup-testdirs.zsh $SERVER $EXPORT $MOUNTPOINT $USER
+setup-testdirs.zsh $SERVER $SCRATCH $SCRATCHMNT $USER