r7758: When not running on the build farm, print out the failed command line again.

Add NTLMv2 varients to the echo and session key tests.

Andrew Bartlett
(This used to be commit 544a38824e2b10c65e6f7ef0b373aa8575fa2cb1)

diff --git a/source4/script/tests/test_echo.sh b/source4/script/tests/test_echo.sh
index 708afae2bbb3980da942d194f94828d01cde14a9..3b6c2d286dc453d9457fac2ed7f9e4023324216a 100755 (executable)
--- a/source4/script/tests/test_echo.sh
+++ b/source4/script/tests/test_echo.sh
@@ -32,15 +32,18 @@ for transport in $transports; do
         "--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" \
     ; do
-   name="$transport with $bindoptions and $ntlmoptions"
+   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
  done
 done
 
 # separately test the print option - its v slow
-name="print option"
+name="RPC-ECHO with print option"
 testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[print]" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
 
 testok $0 $failed

diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index 771e0246786f435defbbeee072597465ab7730bf..fa007f7cae4c2f37689989b1ef4b2e1d5267f1bb 100644 (file)
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -109,7 +109,7 @@ testit() {
                        echo "TEST FAILED: $name (status $status)"
                        echo "=========================================="
                else
-                       echo "TEST FAILED: $name (status $status)"
+                       echo "TEST FAILED: $cmdline (status $status)"
                fi
                return 1;
        fi

diff --git a/source4/script/tests/test_session_key.sh b/source4/script/tests/test_session_key.sh
index 48f3d19183d3d7ada457e177926aa83c45ce42ef..77f8732d35796f73aaec2064ef4fa5a8a6e2f9ca 100755 (executable)
--- a/source4/script/tests/test_session_key.sh
+++ b/source4/script/tests/test_session_key.sh
@@ -25,9 +25,14 @@ transport="ncacn_np"
         "--option=usespnego=yes--option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:128bit=no" \
         "--option=usespnego=yes --option=ntlmssp_client:ntlm2=yes --option=ntlmssp_client:keyexchange=no" \
         "--option=usespnego=yes --option=ntlmssp_client:ntlm2=no  --option=ntlmssp_client:keyexchange=no" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=yes" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=yes --option=ntlmssp_client:128bit=no" \
+        "--option=usespnego=yes --option=clientntlmv2auth=yes  --option=ntlmssp_client:keyexchange=no --option=ntlmssp_client:128bit=no" \
+        "--option=usespnego=no --option=clientntlmv2auth=yes" \
         "--option=usespnego=no" \
     ; do
-   name="$transport with $ntlmoptions"
+   name="RPC-SECRETS on $transport with $ntlmoptions"
    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-SECRETS "$*" || failed=`expr $failed + 1`
   done
 testok $0 $failed