test: Move config variables on the same line with commands

Before all configuration variables will be moved at the beginning.

Author: jajik

test/MODCLUSTER-734/testit.sh

@@ -9,18 +9,15 @@ httpd_remove
 # build httpd + mod_proxy_cluster
 rm -f nohup.out
 
-MPC_CONF=${MPC_CONF:-MODCLUSTER-734/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-734
-
-httpd_start
+MPC_NAME=MODCLUSTER-734 MPC_CONF=${MPC_CONF:-MODCLUSTER-734/mod_proxy_cluster.conf} httpd_start
 
 # wait until httpd is started
 httpd_wait_until_ready || exit 1
 
 sleep 10
 
 # start tomcat1 and tomcat2
-tomcat_start_two
+MPC_NAME=MODCLUSTER-734 tomcat_start_two
 
 # wait until they are in mod_proxy_cluster tables
 tomcat_wait_for_n_nodes 2

test/MODCLUSTER-736/testit.sh

@@ -5,12 +5,11 @@
 httpd_remove
 tomcat_all_remove
 
-MPC_NAME=MODCLUSTER-736
 # We must shift tomcat ports so that they do not collide with proxy
 PORT=9000
 SHUTDOWN_PORT=7005
 
-httpd_start
+MPC_NAME=MODCLUSTER-736 httpd_start
 
 # Start a bunch ($1, or 6 if no argument is given) of tomcat
 # containers, then test them and stop them
@@ -23,7 +22,7 @@ runtomcatbatch() {
 
     for i in $(seq $t 10);
     do
-      tomcat_start $i
+      MPC_NAME=MODCLUSTER-736 tomcat_start $i
     done
 
     tomcat_count=$(expr 3 + 11 - $t)
@@ -80,7 +79,7 @@ runtomcatbatch() {
 singlecycle() {
     echo "singlecycle: Testing tomcat$1"
     R=$1
-    tomcat_start $1 || exit 1
+    MPC_NAME=MODCLUSTER-736 tomcat_start $1 || exit 1
 
     # Wait for it to start
     echo "Testing(0) tomcat$1 waiting..."
@@ -194,9 +193,9 @@ cyclestomcats() {
 # basically start and stop random tomcats...
 runmodcluster736() {
     # start 3 tomcats
-    tomcat_start 2
-    tomcat_start 3
-    tomcat_start 4
+    MPC_NAME=MODCLUSTER-736 tomcat_start 2
+    MPC_NAME=MODCLUSTER-736 tomcat_start 3
+    MPC_NAME=MODCLUSTER-736 tomcat_start 4
     tomcat_wait_for_n_nodes 3 || exit 1
     # check them
     tomcat_start_webapp 2 || exit 1
@@ -231,7 +230,7 @@ runmodcluster736() {
             exit 1
         fi
         tomcat_remove 2
-        tomcat_start 5
+        MPC_NAME=MODCLUSTER-736 tomcat_start 5
 
         tomcat_wait_for_n_nodes 3
         if [ $? -ne 0 ]; then
@@ -251,7 +250,7 @@ runmodcluster736() {
         fi
         # we have 5 3 4 in shared memory
         # read 2
-        tomcat_start 2
+        MPC_NAME=MODCLUSTER-736 tomcat_start 2
         tomcat_wait_for_n_nodes 4
         if [ $? -ne 0 ]; then
             echo "tomcat_wait_for_n_nodes 4: runmodcluster736 Failed!"

test/MODCLUSTER-755/testit.sh

@@ -12,13 +12,12 @@ httpd_remove
 tomcat_all_remove
 
 MPC_CONF=${MPC_CONF:-MODCLUSTER-755/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-755
 
-httpd_start
+MPC_NAME=MODCLUSTER-755 httpd_start
 
 httpd_wait_until_ready
 
-tomcat_start 1
+MPC_NAME=MODCLUSTER-755 tomcat_start 1
 
 NODE_COUNT="${NODE_COUNT:-500}"
 APP_COUNT="${APP_COUNT:-2}"

test/MODCLUSTER-785/testit.sh

@@ -10,14 +10,12 @@ httpd_remove
 # build httpd + mod_proxy_cluster
 rm -f nohup.out
 
-MPC_CONF=${MPC_CONF:-MODCLUSTER-785/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-785
 PORT=9000
 
-httpd_start
+MPC_NAME=MODCLUSTER-785 MPC_CONF=${MPC_CONF:-MODCLUSTER-785/mod_proxy_cluster.conf} httpd_start
 
 # start tomcat1 on 8080
-tomcat_start 1
+MPC_NAME=MODCLUSTER-785 tomcat_start 1
 
 # wait until tomcat1 is in mod_proxy_cluster tables
 tomcat_wait_for_n_nodes 1
@@ -49,7 +47,7 @@ sleep 15
 
 # start tomcat1 on 8080
 tomcat_remove 1
-tomcat_start  1
+MPC_NAME=MODCLUSTER-785 tomcat_start  1
 
 # wait until tomcat1 is in mod_proxy_cluster tables
 tomcat_wait_for_n_nodes 1

test/MODCLUSTER-794/testit.sh

@@ -8,13 +8,11 @@ httpd_remove
 
 # due to conflict with proxy's 8090 port we shift tomcats
 PORT=9000
-MPC_CONF=${MPC_CONF:-MODCLUSTER-794/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-794
-httpd_start
+MPC_NAME=MODCLUSTER-794 MPC_CONF=${MPC_CONF:-MODCLUSTER-794/mod_proxy_cluster.conf} httpd_start
 
 
 for i in $(seq 1 20); do
-    tomcat_start $i
+    MPC_NAME=MODCLUSTER-794 tomcat_start $i
 done
 
 sleep 20