r11818: - changed the option torture:echo_TestSleep=yes/no to the more generic

  option torture:quick=yes/no. This should be used in all slow tests to
  enable a quick mode

- enabled the test_rpc_quick.sh tests in 'make quicktest'
(This used to be commit 180c209c1bb48f6421043de2d0d48c29fc7f9274)

4 files changed, 19 insertions, 17 deletions

diff --git a/source4/script/tests/test_binding_string.sh b/source4/script/tests/test_binding_string.sh
index fa4de5a6a8..832c67e269 100755
--- a/source4/script/tests/test_binding_string.sh
+++ b/source4/script/tests/test_binding_string.sh
@@ -28,7 +28,7 @@ for I in "ncacn_np:$server" \
 		 "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_np:$server" \
 		 "308FB580-1EB2-11CA-923B-08002B1075A7@ncacn_ip_tcp:$server" 
 do
-	testit "$I" bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:echo_TestSleep=no RPC-ECHO "$*" || failed=`expr $failed + 1`
+	testit "$I" bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*" || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh
index 2f22e52af3..a8baed735f 100755
--- a/source4/script/tests/test_echo.sh
+++ b/source4/script/tests/test_echo.sh
@@ -28,7 +28,7 @@ failed=0
 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:echo_TestSleep=no"; do
+        "--option=socket:testnonblock=True --option=torture:quick=yes"; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
   done
@@ -38,15 +38,15 @@ done
 for transport in $transports; do
  for bindoptions in sign seal; do
   for ntlmoptions in \
-        "--option=ntlmssp_client:ntlm2=yes --option=torture:echo_TestSleep=no" \
-        "--option=ntlmssp_client:ntlm2=no  --option=torture:echo_TestSleep=no" \
-        "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=no --option=torture:echo_TestSleep=no" \
-        "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:128bit=no --option=torture:echo_TestSleep=no" \
-        "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:echo_TestSleep=no" \
-        "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:keyexchange=no  --option=torture:echo_TestSleep=no" \
-        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no  --option=torture:echo_TestSleep=no" \
-        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes  --option=torture:echo_TestSleep=no" \
-        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no  --option=torture:echo_TestSleep=no" \
+        "--option=ntlmssp_client:ntlm2=yes --option=torture:quick=yes" \
+        "--option=ntlmssp_client:ntlm2=no  --option=torture:quick=yes" \
+        "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:128bit=no --option=torture:quick=yes" \
+        "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:128bit=no --option=torture:quick=yes" \
+        "--option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes" \
+        "--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:keyexchange=no  --option=torture:quick=yes" \
+        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no  --option=torture:quick=yes" \
+        "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=yes  --option=torture:quick=yes" \
+        "--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"
    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
index f5df436ab9..7c35b0842a 100644
--- a/source4/script/tests/tests_quick.sh
+++ b/source4/script/tests/tests_quick.sh
@@ -1,5 +1,7 @@
+TORTURE_OPTIONS="$TORTURE_OPTIONS --option=torture:quick=yes"
+
 $SRCDIR/script/tests/test_ejs.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 $SRCDIR/script/tests/test_nbt.sh $SERVER || failed=`expr $failed + $?`
 $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-
+$SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index afab64565d..ae2be1fe6c 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -242,11 +242,11 @@ static BOOL test_sleep(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	int total_done = 0;
 	BOOL ret = True;
 
-	if (!lp_parm_bool(-1, "torture", "echo_TestSleep", True)) {
-		printf("TestSleep disabled - use \"torture:echo_TestSleep=yes\" to enable\n");
+	if (lp_parm_bool(-1, "torture", "quick", False)) {
+		printf("TestSleep disabled - use \"torture:quick=no\" to enable\n");
 		return True;
 	}
-	printf("Testing TestSleep - use \"torture:echo_TestSleep=no\" to disable\n");
+	printf("Testing TestSleep - use \"torture:quick=no\" to disable\n");
 
 	for (i=0;i<ASYNC_COUNT;i++) {
 		done[i]		= False;
@@ -410,8 +410,8 @@ static BOOL test_timeout(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	struct echo_TestSleep r;
 	int timeout_saved = p->request_timeout;
 
-	if (!lp_parm_bool(-1, "torture", "echo_TestSleep", True)) {
-		printf("timeout testing disabled - use \"torture:echo_TestSleep=yes\" to enable\n");
+	if (lp_parm_bool(-1, "torture", "quick", False)) {
+		printf("timeout testing disabled - use \"torture:quick=no\" to enable\n");
 		return True;
 	}