CVS User Account cvsuser
Tue Mar 15 18:59:31 PST 2005
Log Message:
-----------
Fix widespread problem with checking Make version; needed to
quote $CGNU because it typically contains a multiword result.

Modified Files:
--------------
    slony1-engine/src/ducttape:
        test_1_pgbench (r1.20 -> r1.21)
        test_1_pgbench_no_node1 (r1.2 -> r1.3)
        test_2_pgbench (r1.13 -> r1.14)
        test_3_pgbench (r1.10 -> r1.11)
        test_4_pgbench (r1.7 -> r1.8)
        test_5_pgbench (r1.6 -> r1.7)
        test_6_autolisten (r1.3 -> r1.4)
        test_7_defines (r1.2 -> r1.3)
        test_8_logship (r1.1 -> r1.2)

-------------- next part --------------
Index: test_1_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/ducttape/test_1_pgbench -Lsrc/ducttape/test_1_pgbench -u -w -r1.20 -r1.21
--- src/ducttape/test_1_pgbench
+++ src/ducttape/test_1_pgbench
@@ -54,7 +54,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_6_autolisten
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_6_autolisten,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ducttape/test_6_autolisten -Lsrc/ducttape/test_6_autolisten -u -w -r1.3 -r1.4
--- src/ducttape/test_6_autolisten
+++ src/ducttape/test_6_autolisten
@@ -126,10 +126,10 @@
 # Make sure the install is up to date
 #####
 WGM=`which gmake`
-if [[ $WGM == "" ]]; then
+if [ -z $WGM ]; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [[ $CGNU == "" ]]; then
+    if [ -z "$CGNU" ]; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_8_logship
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_8_logship,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_8_logship -Lsrc/ducttape/test_8_logship -u -w -r1.1 -r1.2
--- src/ducttape/test_8_logship
+++ src/ducttape/test_8_logship
@@ -60,7 +60,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_5_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_5_pgbench,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/ducttape/test_5_pgbench -Lsrc/ducttape/test_5_pgbench -u -w -r1.6 -r1.7
--- src/ducttape/test_5_pgbench
+++ src/ducttape/test_5_pgbench
@@ -58,7 +58,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_2_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_2_pgbench,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/ducttape/test_2_pgbench -Lsrc/ducttape/test_2_pgbench -u -w -r1.13 -r1.14
--- src/ducttape/test_2_pgbench
+++ src/ducttape/test_2_pgbench
@@ -65,7 +65,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_7_defines
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_7_defines,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ducttape/test_7_defines -Lsrc/ducttape/test_7_defines -u -w -r1.2 -r1.3
--- src/ducttape/test_7_defines
+++ src/ducttape/test_7_defines
@@ -57,7 +57,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_1_pgbench_no_node1
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench_no_node1,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ducttape/test_1_pgbench_no_node1 -Lsrc/ducttape/test_1_pgbench_no_node1 -u -w -r1.2 -r1.3
--- src/ducttape/test_1_pgbench_no_node1
+++ src/ducttape/test_1_pgbench_no_node1
@@ -57,7 +57,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_3_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_3_pgbench,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ducttape/test_3_pgbench -Lsrc/ducttape/test_3_pgbench -u -w -r1.10 -r1.11
--- src/ducttape/test_3_pgbench
+++ src/ducttape/test_3_pgbench
@@ -54,7 +54,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi
Index: test_4_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_4_pgbench,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/ducttape/test_4_pgbench -Lsrc/ducttape/test_4_pgbench -u -w -r1.7 -r1.8
--- src/ducttape/test_4_pgbench
+++ src/ducttape/test_4_pgbench
@@ -47,7 +47,7 @@
 if [ -z $WGM ] ; then
     MAKE=make
     CGNU=`make -v | grep GNU`
-    if [ -z $CGNU ] ; then
+    if [ -z "$CGNU" ] ; then
 	echo "GNU Make not found - please install GNU Make"
 	exit 1
     fi


More information about the Slony1-commit mailing list