r6010: Change the testing order, so we test all transports for each binding

option, rather than all binding options for each transport.

This means that we get to most of the tests earlier, with at least
some binding options.  (And allows us to have some confidence before
waiting for an RPC-SAMR test to finish with bigendian).

Andrew Bartlett
(This used to be commit 5c3e4df804e38037d0337e8ef288127d6cdda28a)

2 files changed, 4 insertions, 4 deletions

diff --git a/source4/script/tests/test_rpc.sh b/source4/script/tests/test_rpc.sh
index 83f7929614..abe5b4d349 100755
--- a/source4/script/tests/test_rpc.sh
+++ b/source4/script/tests/test_rpc.sh
@@ -35,8 +35,8 @@ testit() {
    rm -f test.$$;
 }
 
-for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
- for bindoptions in connect sign seal sign,seal spnego spnego,sign spnego,seal validate padcheck bigendian bigendian,seal; do
+for bindoptions in connect sign seal sign,seal spnego spnego,sign spnego,seal validate padcheck bigendian bigendian,seal; do
+ for transport in ncalrpc ncacn_np ncacn_ip_tcp; do
      case $transport in
 	 ncalrpc) tests=$ncalrpc_tests ;;
 	 ncacn_np) tests=$ncacn_np_tests ;;
diff --git a/source4/script/tests/test_w2k3.sh b/source4/script/tests/test_w2k3.sh
index 5a412730ac..363cb7ef68 100755
--- a/source4/script/tests/test_w2k3.sh
+++ b/source4/script/tests/test_w2k3.sh
@@ -39,8 +39,8 @@ testit() {
 
 OPTIONS="-U$username%$password -W $domain --option realm=$realm"
 
-for transport in ncacn_ip_tcp ncacn_np; do
- for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do
+for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do
+   for transport in ncacn_ip_tcp ncacn_np; do
      case $transport in
 	 ncacn_np) tests=$ncacn_np_tests ;;
 	 ncacn_ip_tcp) tests=$ncacn_ip_tcp_tests ;;