Log Message:
-----------
Make "ducttape" scripts that use pgbench aware of varying GNU Make names

Modified Files:
--------------
    slony1-engine/src/ducttape:
        test_1_pgbench (r1.15 -> r1.16)
        test_2_pgbench (r1.8 -> r1.9)
        test_3_pgbench (r1.6 -> r1.7)
        test_4_pgbench (r1.3 -> r1.4)
        test_5_pgbench (r1.2 -> r1.3)

-------------- next part --------------
Index: test_2_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_2_pgbench,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/ducttape/test_2_pgbench -Lsrc/ducttape/test_2_pgbench -u -w -r1.8 -r1.9
--- src/ducttape/test_2_pgbench
+++ src/ducttape/test_2_pgbench
@@ -61,8 +61,19 @@
 #####
 # Make sure the install is up to date
 #####
-echo -n "**** running 'gmake install' in src directory ... "
-if ! gmake -C .. install >$TMPOUT 2>&1 ; then
+WGM=`which gmake`
+if [[ $WGM == "" ]]; then
+    MAKE=make
+    CGNU=`make -v | grep GNU`
+    if [[ $CGNU == "" ]]; then
+	echo "GNU Make not found - please install GNU Make"
+	exit 1
+    fi
+else
+    MAKE=gmake
+fi
+echo -n "**** running 'make install' in src directory ... "
+if ! ${MAKE} -C .. install >$TMPOUT 2>&1 ; then
     echo "failed"; cat $TMPOUT; rm $TMPOUT; exit -1
 fi
 echo "done"
Index: test_1_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/ducttape/test_1_pgbench -Lsrc/ducttape/test_1_pgbench -u -w -r1.15 -r1.16
--- src/ducttape/test_1_pgbench
+++ src/ducttape/test_1_pgbench
@@ -50,8 +50,19 @@
 #####
 # Make sure the install is up to date
 #####
-echo -n "**** running 'gmake install' in src directory ... "
-if ! gmake -C .. install >$TMPOUT 2>&1 ; then
+WGM=`which gmake`
+if [[ $WGM == "" ]]; then
+    MAKE=make
+    CGNU=`make -v | grep GNU`
+    if [[ $CGNU == "" ]]; then
+	echo "GNU Make not found - please install GNU Make"
+	exit 1
+    fi
+else
+    MAKE=gmake
+fi
+echo -n "**** running 'make install' in src directory ... "
+if ! ${MAKE} -C .. install >$TMPOUT 2>&1 ; then
     echo "failed"; cat $TMPOUT; rm $TMPOUT; exit 1
 fi
 echo "done"
Index: test_4_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_4_pgbench,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ducttape/test_4_pgbench -Lsrc/ducttape/test_4_pgbench -u -w -r1.3 -r1.4
--- src/ducttape/test_4_pgbench
+++ src/ducttape/test_4_pgbench
@@ -43,8 +43,19 @@
 #####
 # Make sure the install is up to date
 #####
-echo -n "**** running 'gmake install' in src directory ... "
-if ! gmake -C .. install >$TMPOUT 2>&1 ; then
+WGM=`which gmake`
+if [[ $WGM == "" ]]; then
+    MAKE=make
+    CGNU=`make -v | grep GNU`
+    if [[ $CGNU == "" ]]; then
+	echo "GNU Make not found - please install GNU Make"
+	exit 1
+    fi
+else
+    MAKE=gmake
+fi
+echo -n "**** running 'make install' in src directory ... "
+if ! ${MAKE} -C .. install >$TMPOUT 2>&1 ; then
     echo "failed"; cat $TMPOUT; rm $TMPOUT; exit 1
 fi
 echo "done"
Index: test_3_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_3_pgbench,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/ducttape/test_3_pgbench -Lsrc/ducttape/test_3_pgbench -u -w -r1.6 -r1.7
--- src/ducttape/test_3_pgbench
+++ src/ducttape/test_3_pgbench
@@ -50,11 +50,22 @@
 # have the "application" (pgbench) running.
 ######################################################################
 
+WGM=`which gmake`
+if [[ $WGM == "" ]]; then
+    MAKE=make
+    CGNU=`make -v | grep GNU`
+    if [[ $CGNU == "" ]]; then
+	echo "GNU Make not found - please install GNU Make"
+	exit 1
+    fi
+else
+    MAKE=gmake
+fi
 #####
 # Make sure the install is up to date
 #####
-echo -n "**** running 'gmake install' in src directory ... "
-if ! gmake -C .. install >$TMPOUT 2>&1 ; then
+echo -n "**** running 'make install' in src directory ... "
+if ! ${MAKE} -C .. install >$TMPOUT 2>&1 ; then
     echo "failed"; cat $TMPOUT; rm $TMPOUT; exit 1
 fi
 echo "done"
Index: test_5_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_5_pgbench,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ducttape/test_5_pgbench -Lsrc/ducttape/test_5_pgbench -u -w -r1.2 -r1.3
--- src/ducttape/test_5_pgbench
+++ src/ducttape/test_5_pgbench
@@ -54,8 +54,19 @@
 #####
 # Make sure the install is up to date
 #####
-echo -n "**** running 'gmake install' in src directory ... "
-if ! gmake -C .. install >$TMPOUT 2>&1 ; then
+WGM=`which gmake`
+if [[ $WGM == "" ]]; then
+    MAKE=make
+    CGNU=`make -v | grep GNU`
+    if [[ $CGNU == "" ]]; then
+	echo "GNU Make not found - please install GNU Make"
+	exit 1
+    fi
+else
+    MAKE=gmake
+fi
+echo -n "**** running 'make install' in src directory ... "
+if ! ${MAKE} -C .. install >$TMPOUT 2>&1 ; then
     echo "failed"; cat $TMPOUT; rm $TMPOUT; exit 1
 fi
 echo "done"