svn commit: samba r18349 - in branches/SAMBA_4_0/source/script/tests: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-11 00:43:48 +0000 (Mon, 11 Sep 2006)
New Revision: 18349

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18349

Log:

don't do validation when using valgrind. It's way too slow (can be
hours for a single test)

Modified:
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/script/tests/test_echo.sh
   branches/SAMBA_4_0/source/script/tests/test_net.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
   branches/SAMBA_4_0/source/script/tests/test_session_key.sh
   branches/SAMBA_4_0/source/script/tests/test_w2k3.sh


Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -16,6 +16,13 @@
     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+//+/+`

Modified: branches/SAMBA_4_0/source/script/tests/test_echo.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_echo.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/test_echo.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -26,7 +26,7 @@
 
 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"

Modified: branches/SAMBA_4_0/source/script/tests/test_net.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_net.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/test_net.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -23,7 +23,7 @@
 . $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 ;;

Modified: branches/SAMBA_4_0/source/script/tests/test_rpc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_rpc.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/test_rpc.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -26,7 +26,7 @@
 . $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 @@
  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 ;;

Modified: branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -23,7 +23,7 @@
 . $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 ;;

Modified: branches/SAMBA_4_0/source/script/tests/test_session_key.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_session_key.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/test_session_key.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -19,7 +19,7 @@
 
 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

Modified: branches/SAMBA_4_0/source/script/tests/test_w2k3.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_w2k3.sh	2006-09-11 00:24:21 UTC (rev 18348)
+++ branches/SAMBA_4_0/source/script/tests/test_w2k3.sh	2006-09-11 00:43:48 UTC (rev 18349)
@@ -31,7 +31,7 @@
 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 ;;