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_rpc.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_rpc.sh')
| -rwxr-xr-x | source4/script/tests/test_rpc.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh index 59a403a735..1b8b57d534 100755 --- a/source4/script/tests/test_rpc.sh +++ b/source4/script/tests/test_rpc.sh @@ -9,19 +9,6 @@ slow_ncacn_np_tests="RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS RPC slow_ncalrpc_tests="RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS RPC-COUNTCALLS RPC-CRACKNAMES" slow_ncacn_ip_tcp_tests="RPC-SAMR RPC-SAMR-USERS RPC-SAMR-PASSWORDS RPC-COUNTCALLS RPC-CRACKNAMES" -if [ $# -lt 4 ]; then -cat <<EOF -Usage: test_rpc.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 @@ -34,7 +21,7 @@ for bindoptions in seal,padcheck $VALIDATE bigendian; do esac for t in $tests; do name="$t on $transport with $bindoptions" - plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" + plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*" done done done @@ -48,7 +35,7 @@ for bindoptions in connect $VALIDATE ; do esac for t in $tests; do name="$t on $transport with $bindoptions" - plantest "$name" rpc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" + plantest "$name" dc $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN $t "$*" done done done |