summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-01-09 22:28:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:58 -0500
commitfaeff2a1698bc749757edc78410165e948a495c0 (patch)
treef5ebfabd80f2e4560c18237a89085b6ba12ba42f /source4
parentf3e9868613c4104f31c154030b45985e527c0ba5 (diff)
downloadsamba-faeff2a1698bc749757edc78410165e948a495c0.tar.gz
samba-faeff2a1698bc749757edc78410165e948a495c0.tar.bz2
samba-faeff2a1698bc749757edc78410165e948a495c0.zip
r12806: tridge: in revision 12634 you introduced to validate the ndr_print output
and RPC-ECHO doesn't pass under valgrind anymore with this metze (This used to be commit 2482bf969d5b903a01ace8fa9237dd440b98196c)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/script/tests/test_rpc_quick.sh17
1 files changed, 12 insertions, 5 deletions
diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh
index 4ff6df0211..63ff419b99 100755
--- a/source4/script/tests/test_rpc_quick.sh
+++ b/source4/script/tests/test_rpc_quick.sh
@@ -2,9 +2,16 @@
# add tests to this list as they start passing, so we test
# that they stay passing
-ncacn_np_tests="RPC-ECHO RPC-ALTERCONTEXT RPC-JOIN"
-ncalrpc_tests="RPC-ECHO RPC-ALTERCONTEXT RPC-JOIN"
-ncacn_ip_tcp_tests="RPC-ECHO RPC-ALTERCONTEXT RPC-JOIN"
+ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN"
+ncalrpc_tests="RPC-ALTERCONTEXT RPC-JOIN"
+ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN"
+
+# if we're not running under valgrind test some more tests
+if [ -z "$VALGRIND" ]; then
+ ncacn_np_tests="$ncacn_np_tests RPC-ECHO"
+ ncalrpc_tests="$ncalrpc_tests RPC-ECHO"
+ ncacn_ip_tcp_tests="$ncacn_ip_tcp_tests RPC-ECHO"
+fi
if [ $# -lt 4 ]; then
cat <<EOF
@@ -25,11 +32,11 @@ incdir=`dirname $0`
failed=0
for bindoptions in seal,validate,padcheck bigendian; do
for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
- case $transport in
+ case $transport in
ncalrpc) tests=$ncalrpc_tests ;;
ncacn_np) tests=$ncacn_np_tests ;;
ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;
- esac
+ esac
for t in $tests; do
name="$t on $transport with $bindoptions"
testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`