summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2019-11-19 14:11:21 +0000
committerRalph Boehme <slow@samba.org>2019-12-05 17:14:46 +0000
commit7c0ccbe1a004b96ccf726bda01262e5394c4d0b6 (patch)
tree21af92a0753ba292b66fd6ab5c746e47b27e293b
parentb4b25128b878cc4c41973de9c5ef5e9d0109a6a4 (diff)
downloadsamba-7c0ccbe1a004b96ccf726bda01262e5394c4d0b6.tar.gz
s3/script/tests: Prepare to split samba3.blackbox.net.misc for SMB1/SMB2
modify test_net_misc.sh to accept optional protocol, no protocol specified and it behaves more or less as before (expect this time the client max protocol is explicitly speficied) Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Ralph Boehme <slow@samba.org>
-rwxr-xr-xsource3/script/tests/test_net_misc.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/script/tests/test_net_misc.sh b/source3/script/tests/test_net_misc.sh
index 566694be74b..afd6bed2599 100755
--- a/source3/script/tests/test_net_misc.sh
+++ b/source3/script/tests/test_net_misc.sh
@@ -14,10 +14,16 @@ SERVERCONFFILE="$2"
NET="$3"
CONFIGURATION="$4"
-NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+# optional protocl, default to NT1
+if [ $# -gt 4 ]; then
+ PROTOCOL="$5"
+else
+ PROTOCOL="NT1"
+fi
-NETTIME="${NET} time"
-NETLOOKUP="${NET} lookup"
+NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+NETTIME="${NET} --option=clientmaxprotocol=${PROTOCOL} time"
+NETLOOKUP="${NET} --option=clientmaxprotocol=${PROTOCOL} lookup"
incdir=`dirname $0`/../../../testprogs/blackbox
. $incdir/subunit.sh