diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-04-10 20:19:31 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:49:55 -0500 |
commit | e338b4b47b6271ca46060a1fe8c61ab8afaecc8f (patch) | |
tree | 315e3b28abd60f04f5d5a7cc871e6d246ef931f2 /source4/script/tests/test_echo.sh | |
parent | 4cc500433d07decf8fc2551b117e15537f6c8558 (diff) | |
download | samba-e338b4b47b6271ca46060a1fe8c61ab8afaecc8f.tar.gz samba-e338b4b47b6271ca46060a1fe8c61ab8afaecc8f.tar.bz2 samba-e338b4b47b6271ca46060a1fe8c61ab8afaecc8f.zip |
r22156: - Lazy evaluate variable names.
- Don't set up environments until necessary
- Add --resetup-environment option
- Add 'none' environment
(This used to be commit ed0410309bfdefb0d31cb247c26b947956fb1137)
Diffstat (limited to 'source4/script/tests/test_echo.sh')
-rwxr-xr-x | source4/script/tests/test_echo.sh | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh index 79a19b1c2e..f09aeca4e5 100755 --- a/source4/script/tests/test_echo.sh +++ b/source4/script/tests/test_echo.sh @@ -1,35 +1,16 @@ #!/bin/sh -if [ $# -lt 4 ]; then -cat <<EOF -Usage: test_echo.sh SERVER USERNAME PASSWORD DOMAIN -EOF -exit 1; -fi - -server="$1" -username="$2" -password="$3" -domain="$4" -shift 4 - incdir=`dirname $0` . $incdir/test_functions.sh -transports="ncacn_np ncacn_ip_tcp" -if [ $server = "localhost" ]; then - transports="ncalrpc $transports" -fi -if [ $server = "localtest" ]; then - transports="ncalrpc $transports" -fi +transports="ncacn_np ncacn_ip_tcp ncalrpc" for transport in $transports; do for bindoptions in connect spnego spnego,sign spnego,seal $VALIDATE padcheck bigendian bigendian,seal; do for ntlmoptions in \ "--option=socket:testnonblock=True --option=torture:quick=yes"; do name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions" - plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" + plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W "\$DOMAIN" RPC-ECHO "$*" done done done @@ -48,10 +29,10 @@ for transport in $transports; do "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes" \ ; do name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions" - plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" + plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" $ntlmoptions -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*" done done done name="RPC-ECHO on ncacn_np over smb2" -plantest "$name" rpc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*" +plantest "$name" dc bin/smbtorture $TORTURE_OPTIONS ncacn_np:"\$SERVER[smb2]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*" |