7 files changed, 14 insertions, 7 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index 7ba5b5c897..8c4c41e197 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -16,6 +16,13 @@ if [ -z "$TORTURE_MAXTIME" ]; then
     TORTURE_MAXTIME=1200
 fi
 
+# disable rpc validation when using valgrind - its way too slow
+if [ -z "$VALGRIND" ]; then
+    VALIDATE="validate";
+else
+    VALIDATE="";
+fi
+
 OLD_PWD=`pwd`
 PREFIX=$ARG1
 PREFIX=`echo $PREFIX | sed s+//+/+`
diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh
index b02ea03037..88a17ee68c 100755
--- a/source4/script/tests/test_echo.sh
+++ b/source4/script/tests/test_echo.sh
@@ -26,7 +26,7 @@ fi
 
 failed=0
 for transport in $transports; do
- for bindoptions in connect spnego spnego,sign spnego,seal validate padcheck bigendian bigendian,seal; 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"
diff --git a/source4/script/tests/test_net.sh b/source4/script/tests/test_net.sh
index eb36f27cbb..5f92625887 100755
--- a/source4/script/tests/test_net.sh
+++ b/source4/script/tests/test_net.sh
@@ -23,7 +23,7 @@ incdir=`dirname $0`
 . $incdir/test_functions.sh
 
 failed=0
-for bindoptions in seal,validate,padcheck bigendian; do
+for bindoptions in seal,padcheck $VALIDATE bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      case $transport in
 	 ncalrpc) tests=$ncalrpc_tests ;;
diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh
index 135122e813..143d57cc78 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -26,7 +26,7 @@ incdir=`dirname $0`
 . $incdir/test_functions.sh
 
 failed=0
-for bindoptions in seal,validate,padcheck bigendian; do
+for bindoptions in seal,padcheck $VALIDATE bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      case $transport in
 	 ncalrpc) tests=$ncalrpc_tests ;;
@@ -40,7 +40,7 @@ for bindoptions in seal,validate,padcheck bigendian; do
  done
 done
 
-for bindoptions in connect validate ; do
+for bindoptions in connect $VALIDATE ; do
  for transport in ncalrpc; do
      case $transport in
 	 ncalrpc) tests=$slow_ncalrpc_tests ;;
diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh
index bc59d08b62..795a234029 100755
--- a/source4/script/tests/test_rpc_quick.sh
+++ b/source4/script/tests/test_rpc_quick.sh
@@ -23,7 +23,7 @@ incdir=`dirname $0`
 . $incdir/test_functions.sh
 
 failed=0
-for bindoptions in seal,validate,padcheck bigendian; do
+for bindoptions in seal,padcheck $VALIDATE bigendian; do
  for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
    case $transport in
 	 ncalrpc) tests=$ncalrpc_tests ;;
diff --git a/source4/script/tests/test_session_key.sh b/source4/script/tests/test_session_key.sh
index 54dde9e343..fbb8843e16 100755
--- a/source4/script/tests/test_session_key.sh
+++ b/source4/script/tests/test_session_key.sh
@@ -19,7 +19,7 @@ incdir=`dirname $0`
 
 failed=0
 transport="ncacn_np"
-for bindoptions in validate seal; do
+for bindoptions in $VALIDATE seal; do
  for keyexchange in "yes" "no"; do
  for ntlm2 in "yes" "no"; do
  for lm_key in "yes" "no"; do
diff --git a/source4/script/tests/test_w2k3.sh b/source4/script/tests/test_w2k3.sh
index d3192e7bc9..1e791d376b 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/script/tests/test_w2k3.sh
@@ -31,7 +31,7 @@ failed=0
 name="RPC-SPOOLSS on ncacn_np"
 testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*" || failed=`expr $failed + 1`
 
-for bindoptions in padcheck connect sign seal ntlm,sign ntlm,seal validate bigendian; do
+for bindoptions in padcheck connect sign seal ntlm,sign ntlm,seal $VALIDATE bigendian; do
    for transport in ncacn_ip_tcp ncacn_np; do
      case $transport in
 	 ncacn_np) tests=$ncacn_np_tests ;;