Author: tridge Date: 2006-01-10 03:26:39 +0000 (Tue, 10 Jan 2006) New Revision: 12812
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12812 Log: speed up RPC-ECHO with validate some more, and re-enable it under valgrind in 'make valgrindtest' Modified: branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh branches/SAMBA_4_0/source/torture/rpc/echo.c Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh =================================================================== --- branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh 2006-01-10 03:18:33 UTC (rev 12811) +++ branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh 2006-01-10 03:26:39 UTC (rev 12812) @@ -2,17 +2,10 @@ # add tests to this list as they start passing, so we test # that they stay passing -ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN" -ncalrpc_tests="RPC-ALTERCONTEXT RPC-JOIN" -ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN" +ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO" +ncalrpc_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO" +ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO" -# 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 Usage: test_rpc_quick.sh SERVER USERNAME PASSWORD DOMAIN Modified: branches/SAMBA_4_0/source/torture/rpc/echo.c =================================================================== --- branches/SAMBA_4_0/source/torture/rpc/echo.c 2006-01-10 03:18:33 UTC (rev 12811) +++ branches/SAMBA_4_0/source/torture/rpc/echo.c 2006-01-10 03:26:39 UTC (rev 12812) @@ -77,9 +77,16 @@ int i; NTSTATUS status; uint8_t *data_in, *data_out; - int len = 1 + (random() % 5000); + int len; struct echo_EchoData r; + if (lp_parm_bool(-1, "torture", "quick", False) && + (p->conn->flags & DCERPC_DEBUG_VALIDATE_BOTH)) { + len = 1 + (random() % 500); + } else { + len = 1 + (random() % 5000); + } + printf("\nTesting EchoData\n"); data_in = talloc_size(mem_ctx, len); @@ -128,7 +135,7 @@ if (lp_parm_bool(-1, "torture", "quick", False) && (p->conn->flags & DCERPC_DEBUG_VALIDATE_BOTH)) { - len = 100 + (random() % 5000); + len = 100 + (random() % 500); } else { len = 200000 + (random() % 5000); }
