Log Message:
-----------
Fix method of sourcing central 'compare_pgbench_dumps' script which
had evidently broken on FreeBSD's sh (though not for Bash, ksh)

Modified Files:
--------------
    slony1-engine/src/ducttape:
        compare_pgbench_dumps (r1.1 -> r1.2)
        test_1_pgbench (r1.24 -> r1.25)
        test_1_pgbench_no_node1 (r1.4 -> r1.5)
        test_4_pgbench (r1.10 -> r1.11)
        test_7_defines (r1.5 -> r1.6)
        test_8_logship (r1.5 -> r1.6)
        test_9_fileconf (r1.2 -> r1.3)
        test_D_moveset (r1.1 -> r1.2)

-------------- next part --------------
Index: test_9_fileconf
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_9_fileconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ducttape/test_9_fileconf -Lsrc/ducttape/test_9_fileconf -u -w -r1.2 -r1.3
--- src/ducttape/test_9_fileconf
+++ src/ducttape/test_9_fileconf
@@ -294,5 +294,5 @@
 kill $slon1_pid 2>/dev/null
 kill $slon2_pid 2>/dev/null
 
-. compare_pgbench_dumps $DB1 $DB2
+./compare_pgbench_dumps $DB1 $DB2
 rm $PREAMBLE_FILE $SLONCONF1 $SLONCONF2
Index: test_1_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lsrc/ducttape/test_1_pgbench -Lsrc/ducttape/test_1_pgbench -u -w -r1.24 -r1.25
--- src/ducttape/test_1_pgbench
+++ src/ducttape/test_1_pgbench
@@ -270,4 +270,4 @@
 kill $slon1_pid 2>/dev/null
 kill $slon2_pid 2>/dev/null
 
-. compare_pgbench_dumps $DB1 $DB2
+./compare_pgbench_dumps $DB1 $DB2
Index: test_D_moveset
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_D_moveset,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_D_moveset -Lsrc/ducttape/test_D_moveset -u -w -r1.1 -r1.2
--- src/ducttape/test_D_moveset
+++ src/ducttape/test_D_moveset
@@ -314,5 +314,5 @@
 
 echo "Terminated slons, pg_bench, comparing..."
 
-. compare_pgbench_dumps $DB1 $DB2
+./compare_pgbench_dumps $DB1 $DB2
 rm $PREAMBLE_FILE
Index: test_7_defines
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_7_defines,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ducttape/test_7_defines -Lsrc/ducttape/test_7_defines -u -w -r1.5 -r1.6
--- src/ducttape/test_7_defines
+++ src/ducttape/test_7_defines
@@ -277,5 +277,5 @@
 kill $slon1_pid 2>/dev/null
 kill $slon2_pid 2>/dev/null
 
-. compare_pgbench_dumps $DB1 $DB2
+./compare_pgbench_dumps $DB1 $DB2
 rm $PREAMBLE_FILE
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.4
retrieving revision 1.5
diff -Lsrc/ducttape/test_1_pgbench_no_node1 -Lsrc/ducttape/test_1_pgbench_no_node1 -u -w -r1.4 -r1.5
--- src/ducttape/test_1_pgbench_no_node1
+++ src/ducttape/test_1_pgbench_no_node1
@@ -276,4 +276,4 @@
 kill $slon1_pid 2>/dev/null
 kill $slon2_pid 2>/dev/null
 
-. compare_pgbench_dumps $DB1 $DB2
\ No newline at end of file
+./compare_pgbench_dumps $DB1 $DB2
Index: compare_pgbench_dumps
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/compare_pgbench_dumps,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/compare_pgbench_dumps -Lsrc/ducttape/compare_pgbench_dumps -u -w -r1.1 -r1.2
--- src/ducttape/compare_pgbench_dumps
+++ src/ducttape/compare_pgbench_dumps
@@ -3,14 +3,11 @@
 # **********
 # compare_pgbench_dumps
 # **********
-
-export PATH
 TMPOUT=/tmp/output.$$
 DB1=$1    # First database
 DB2=$2    # Second database
-DEBUG_LEVEL=2
 
-echo -n "**** comparing databases ... "
+echo -n "**** comparing databases $DB1 and $DB2 ... "
 psql $DB1 >dump.tmp.1.$$ <<_EOF_
 	select 'accounts:'::text, aid, bid, abalance, filler
 			from accounts order by aid;
Index: test_4_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_4_pgbench,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ducttape/test_4_pgbench -Lsrc/ducttape/test_4_pgbench -u -w -r1.10 -r1.11
--- src/ducttape/test_4_pgbench
+++ src/ducttape/test_4_pgbench
@@ -304,4 +304,4 @@
 kill $slon1_pid 2>/dev/null
 kill $slon2_pid 2>/dev/null
 
-. compare_pgbench_dumps $DB1 $DB2
+./compare_pgbench_dumps $DB1 $DB2
Index: test_8_logship
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_8_logship,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ducttape/test_8_logship -Lsrc/ducttape/test_8_logship -u -w -r1.5 -r1.6
--- src/ducttape/test_8_logship
+++ src/ducttape/test_8_logship
@@ -278,5 +278,5 @@
 kill $slon1_pid 2>/dev/null
 kill $slon2_pid 2>/dev/null
 
-. compare_pgbench_dumps $DB1 $DB2
+./compare_pgbench_dumps $DB1 $DB2
 rm $PREAMBLE_FILE