summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2015-09-16 14:39:22 -0400
committerSteve Dickson <steved@redhat.com>2015-09-16 14:39:22 -0400
commitf3e8693ecba5d46d3c4946ef8f2cf50d2a98ad01 (patch)
tree74a59f67c7e7701439aa20d5ea72eb4ef56d6c35
parent646cd69d890ae2af495042592cd3037ececcadb7 (diff)
downloadcthon04-f3e8693ecba5d46d3c4946ef8f2cf50d2a98ad01.tar.gz
cthon04-f3e8693ecba5d46d3c4946ef8f2cf50d2a98ad01.tar.xz
cthon04-f3e8693ecba5d46d3c4946ef8f2cf50d2a98ad01.zip
Reoved v2 tests
Signed-off-by: Steve Dickson <steved@redhat.com>
-rwxr-xr-xruncthon33
1 files changed, 7 insertions, 26 deletions
diff --git a/runcthon b/runcthon
index 4ca72ef..6797cfb 100755
--- a/runcthon
+++ b/runcthon
@@ -10,8 +10,7 @@ server=$2
vers=$3
proto=$4
sec=$5
-#echo "test=$test server=$server vers-$vers proto=$proto sec=$sec"
-#return
+
if [ $vers = "4" ]; then
if [ -n "$sec" ] ; then
if [ $minver -gt 0 ]; then
@@ -257,38 +256,29 @@ tests="b g s l"
[ "$nolcks" -eq 1 ] && tests="b g s"
for i in $tests
do
- if [ "$onlykrb5" -eq 0 ]; then
+ if [ "$onlykrb5" -eq 0 -a $dokrb5 -eq 1 ]; then
if [ "$noudp" -ne 1 -a "$onlyrdma" -eq 0 ]; then
if [ "$onlyv4" -eq 0 ]; then
- runtests -$i $SRV 3 udp ""
- if [ "$onlyv3" -eq 0 -a "$nov2" -eq 0 ]; then
- runtests -$i $SRV 2 udp ""
- fi
+ runtests -$i $SRV 3 udp "sys"
fi
fi
if [ "$onlyv4" -eq 0 -a "$onlyrdma" -eq 0 ]; then
- runtests -$i $SRV 3 tcp ""
- if [ "$onlyv3" -eq 0 -a "$nov2" -eq 0 ]; then
- runtests -$i $SRV 2 tcp ""
- fi
+ runtests -$i $SRV 3 tcp "sys"
fi
if [ "$onlyv3" -ne 1 -a "$onlyrdma" -eq 0 ]; then
if [ "$nov4" -eq 0 ]; then
- runtests -$i $SRV 4 tcp ""
+ runtests -$i $SRV 4 tcp "sys"
if [ "$dov41" -eq 1 ]; then
- runtests -$i $SRV 41 tcp ""
+ runtests -$i $SRV 41 tcp "sys"
fi
if [ "$dov42" -eq 1 ]; then
- runtests -$i $SRV 42 tcp ""
+ runtests -$i $SRV 42 tcp "sys"
fi
fi
fi
if [ "$rdma" -eq 1 ]; then
if [ "$onlyv4" -eq 0 ]; then
runtests -$i $SRV 3 rdma ""
- if [ "$onlyv3" -eq 0 -a "$nov2" -eq 0 ]; then
- runtests -$i $SRV 2 rdma ""
- fi
fi
if [ "$onlyv3" -ne 1 ]; then
if [ "$nov4" -eq 0 ]; then
@@ -314,16 +304,10 @@ do
if [ "$noudp" -ne 1 -a "$onlyrdma" -eq 0 ]; then
if [ "$onlyv4" -eq 0 ]; then
runtests -$i $SRV 3 udp $j
- if [ "$onlyv3" -eq 0 -a "$nov2" -eq 0 ]; then
- runtests -$i $SRV 2 udp $j
- fi
fi
fi
if [ "$onlyv4" -eq 0 -a "$onlyrdma" -eq 0 ]; then
runtests -$i $SRV 3 tcp $j
- if [ "$onlyv3" -eq 0 -a "$nov2" -eq 0 ]; then
- runtests -$i $SRV 2 tcp $j
- fi
fi
if [ "$onlyv3" -ne 1 -a "$onlyrdma" -eq 0 ]; then
if [ "$nov4" -eq 0 ]; then
@@ -339,9 +323,6 @@ do
if [ "$rdma" -eq 1 ]; then
if [ "$onlyv4" -eq 0 ]; then
runtests -$i $SRV 3 rdma $j
- if [ "$onlyv3" -eq 0 -a "$nov2" -eq 0 ]; then
- runtests -$i $SRV 2 rdma $j
- fi
fi
if [ "$onlyv3" -ne 1 ]; then
if [ "$nov4" -eq 0 ]; then