Log Message:
-----------
Fixed problem with evaluation of whether to use "make" or "gmake";
running this on AIX showed off that the output of "which gmake"
can be an enormous string as opposed to the shell returning
bad return codes...

Modified Files:
--------------
    slony1-engine/src/ducttape:
        test_1_pgbench (r1.21 -> r1.22)
        test_2_pgbench (r1.14 -> r1.15)
        test_3_pgbench (r1.11 -> r1.12)
        test_4_pgbench (r1.8 -> r1.9)
        test_5_pgbench (r1.7 -> r1.8)
        test_6_autolisten (r1.4 -> r1.5)
        test_7_defines (r1.3 -> r1.4)
        test_8_logship (r1.2 -> r1.3)

-------------- next part --------------
Index: test_1_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ducttape/test_1_pgbench -Lsrc/ducttape/test_1_pgbench -u -w -r1.21 -r1.22
--- src/ducttape/test_1_pgbench
+++ src/ducttape/test_1_pgbench
@@ -19,6 +19,7 @@
 TMPOUT=/tmp/output.$$
 DB1=slony_test1
 DB2=slony_test2
+DEBUG_LEVEL=2
 
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=5
@@ -50,8 +51,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -124,7 +125,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 11" -e sh -c "slon -d2 -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 11" -e sh -c "slon -d$DEBUG_LEVEL -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -222,7 +223,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 22" -e sh -c "slon -d2 -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 22" -e sh -c "slon -d$DEBUG_LEVEL -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
Index: test_6_autolisten
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_6_autolisten,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ducttape/test_6_autolisten -Lsrc/ducttape/test_6_autolisten -u -w -r1.4 -r1.5
--- src/ducttape/test_6_autolisten
+++ src/ducttape/test_6_autolisten
@@ -18,6 +18,7 @@
 export PATH
 TMPOUT=/tmp/output.$$
 ORIGIN=slony_test1
+DEBUG_LEVEL=2
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=5
 PGBENCH_TRANS=`expr 50000 / $PGBENCH_CLIENTS`
@@ -85,7 +86,7 @@
 function slon_start () {
     local NODE=$1
     echo "**** starting the Slony-I node daemon for slony_test$NODE"
-    xterm -title "Slon node $NODE" -e sh -c "slon -d$NODE T1 dbname=slony_test$NODE; echo -n 'Enter>'; read line" &
+    xterm -title "Slon node $NODE" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=slony_test$NODE; echo -n 'Enter>'; read line" &
     PID[$NODE]=$!
     pid=$PID[$NODE]
     echo "slon[$pid] on dbname=slony_test$NODE"
@@ -125,8 +126,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ]; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ]; then
Index: test_8_logship
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_8_logship,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ducttape/test_8_logship -Lsrc/ducttape/test_8_logship -u -w -r1.2 -r1.3
--- src/ducttape/test_8_logship
+++ src/ducttape/test_8_logship
@@ -28,7 +28,7 @@
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=5
 PGBENCH_TRANS=`expr 30000 / $PGBENCH_CLIENTS`
-DEBUGLEVEL=4
+DEBUG_LEVEL=2
 
 trap '
 	echo ""
@@ -56,8 +56,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -135,7 +135,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 11" -e sh -c "slon -d$DEBUGLEVEL -s500 -g10 $CLUSTERNAME dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 11" -e sh -c "slon -d$DEBUG_LEVEL -s500 -g10 $CLUSTERNAME dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -232,7 +232,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 22" -e sh -c "slon -d$DEBUGLEVEL -s10000 -o10000 -g10 -a $LOGSHIPDIR $CLUSTERNAME dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 22" -e sh -c "slon -d$DEBUG_LEVEL -s10000 -o10000 -g10 -a $LOGSHIPDIR $CLUSTERNAME dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
Index: test_5_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_5_pgbench,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/ducttape/test_5_pgbench -Lsrc/ducttape/test_5_pgbench -u -w -r1.7 -r1.8
--- src/ducttape/test_5_pgbench
+++ src/ducttape/test_5_pgbench
@@ -23,6 +23,7 @@
 TMPOUT=/tmp/output.$$
 DB1=slony_test1
 DB2=slony_test2
+DEBUG_LEVEL=2
 
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=2
@@ -54,8 +55,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -125,7 +126,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 1" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -220,7 +221,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 2" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
Index: test_2_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_2_pgbench,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/ducttape/test_2_pgbench -Lsrc/ducttape/test_2_pgbench -u -w -r1.14 -r1.15
--- src/ducttape/test_2_pgbench
+++ src/ducttape/test_2_pgbench
@@ -26,6 +26,7 @@
 DB1=slony_test1
 DB2=slony_test2
 DB3=slony_test3
+DEBUG_LEVEL=2
 
 PGBENCH_SCALE=10
 PGBENCH_CLIENTS=5
@@ -61,8 +62,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -135,7 +136,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 1" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -231,7 +232,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB2"
-xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 2" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
@@ -307,7 +308,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB3"
-xterm -title "Slon node 3" -e sh -c "slon -d2 T1 dbname=$DB3; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 3" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB3; echo -n 'Enter>'; read line" &
 slon3_pid=$!
 echo "slon[$slon3_pid] on dbname=$DB3"
 
Index: test_7_defines
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_7_defines,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ducttape/test_7_defines -Lsrc/ducttape/test_7_defines -u -w -r1.3 -r1.4
--- src/ducttape/test_7_defines
+++ src/ducttape/test_7_defines
@@ -22,6 +22,7 @@
 TMPOUT=/tmp/output.$$
 DB1=slony_test1
 DB2=slony_test2
+DEBUG_LEVEL=2
 
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=5
@@ -53,8 +54,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -133,7 +134,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 11" -e sh -c "slon -d2 -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 11" -e sh -c "slon -d$DEBUG_LEVEL -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -230,7 +231,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 22" -e sh -c "slon -d2 -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 22" -e sh -c "slon -d$DEBUG_LEVEL -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
Index: test_3_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_3_pgbench,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/ducttape/test_3_pgbench -Lsrc/ducttape/test_3_pgbench -u -w -r1.11 -r1.12
--- src/ducttape/test_3_pgbench
+++ src/ducttape/test_3_pgbench
@@ -22,6 +22,7 @@
 TMPOUT=/tmp/output.$$
 DB1=slony_test1
 DB2=slony_test2
+DEBUG_LEVEL=2
 
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=5
@@ -50,8 +51,8 @@
 # have the "application" (pgbench) running.
 ######################################################################
 
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -174,7 +175,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 1" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -277,7 +278,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 2" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
Index: test_4_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_4_pgbench,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/ducttape/test_4_pgbench -Lsrc/ducttape/test_4_pgbench -u -w -r1.8 -r1.9
--- src/ducttape/test_4_pgbench
+++ src/ducttape/test_4_pgbench
@@ -12,6 +12,7 @@
 TMPOUT=/tmp/output.$$
 DB1=slony_test1
 DB2=slony_test2
+DEBUG_LEVEL=2
 
 PGBENCH_SCALE=1
 PGBENCH_CLIENTS=2
@@ -43,8 +44,8 @@
 #####
 # Make sure the install is up to date
 #####
-WGM=`which gmake`
-if [ -z $WGM ] ; then
+WGM=`which gmake | egrep '^/'`
+if [ -z "$WGM" ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
     if [ -z "$CGNU" ] ; then
@@ -114,7 +115,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 1" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
@@ -206,7 +207,7 @@
 fi
 
 echo "**** starting the Slony-I node daemon for $DB1"
-xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+xterm -title "Slon node 2" -e sh -c "slon -d$DEBUG_LEVEL T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"