setup-testdirs.zsh: Combine with parts of setup-{cthon,xfstests}.zsh

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

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
 
 #

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() {

setup-cthon.zsh

@@ -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

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

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