Thu Jun 1 05:35:53 PDT 2006
- Previous message: [Slony1-commit] By dpage: On Windows the line endings cause the cmp test to fail.
- Next message: [Slony1-commit] By cbbrowne: Make it clearer that test2 doesn't perform a useful test,
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Do not redirect psql output on Windows as more.exe will stop at 8MB. Use psql -o instead.
Modified Files:
--------------
slony1-engine/src/ducttape:
test_2_pgbench.in (r1.1 -> r1.2)
test_3_pgbench.in (r1.1 -> r1.2)
test_5_pgbench.in (r1.1 -> r1.2)
test_6_autolisten.in (r1.1 -> r1.2)
test_A_namequoting.in (r1.1 -> r1.2)
test_B_notables.in (r1.1 -> r1.2)
-------------- next part --------------
Index: test_5_pgbench.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_5_pgbench.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_5_pgbench.in -Lsrc/ducttape/test_5_pgbench.in -u -w -r1.1 -r1.2
--- src/ducttape/test_5_pgbench.in
+++ src/ducttape/test_5_pgbench.in
@@ -273,7 +273,7 @@
kill $slon2_pid 2>/dev/null
echo -n "**** comparing databases ... "
-psql $DB1 >dump.tmp.1.$$ <<_EOF_
+psql $DB1 -o dump.tmp.1.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler, lastuser
from accounts order by aid;
select 'accounts_audit:'::text, au_aid, au_seqno, au_delta, au_user, au_time
@@ -287,7 +287,7 @@
select 'history:'::text, tid, bid, aid, delta, mtime, filler,
"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
_EOF_
-psql $DB2 >dump.tmp.2.$$ <<_EOF_
+psql $DB2 -o dump.tmp.2.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler, lastuser
from accounts order by aid;
select 'accounts_audit:'::text, au_aid, au_seqno, au_delta, au_user, au_time
Index: test_B_notables.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_B_notables.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_B_notables.in -Lsrc/ducttape/test_B_notables.in -u -w -r1.1 -r1.2
--- src/ducttape/test_B_notables.in
+++ src/ducttape/test_B_notables.in
@@ -258,7 +258,7 @@
kill $slon2_pid 2>/dev/null
echo -n "**** comparing databases ... "
-psql $DB1 >dump.tmp.1.$$ <<_EOF_
+psql $DB1 -o dump.tmp.1.$$ <<_EOF_
select id, "user"
from "Schema.name"."user" order by id;
select "user", description
@@ -266,7 +266,7 @@
select id, name, "eViL StudlyCaps.column"
from public.evil_index_table order by id;
_EOF_
-psql $DB2 >dump.tmp.2.$$ <<_EOF_
+psql $DB2 -o dump.tmp.2.$$ <<_EOF_
select id, "user"
from "Schema.name"."user" order by id;
select "user", description
Index: test_3_pgbench.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_3_pgbench.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_3_pgbench.in -Lsrc/ducttape/test_3_pgbench.in -u -w -r1.1 -r1.2
--- src/ducttape/test_3_pgbench.in
+++ src/ducttape/test_3_pgbench.in
@@ -331,7 +331,7 @@
kill $slon2_pid 2>/dev/null
echo -n "**** comparing databases ... "
-psql $DB1 >dump.tmp.1.$$ <<_EOF_
+psql $DB1 -o dump.tmp.1.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler
from accounts order by aid;
select 'accounts_audit:'::text, au_aid, au_seqno, au_delta, au_user, au_time
@@ -345,7 +345,7 @@
select 'history:'::text, tid, bid, aid, delta, mtime, filler,
"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
_EOF_
-psql $DB2 >dump.tmp.2.$$ <<_EOF_
+psql $DB2 -o dump.tmp.2.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler
from accounts order by aid;
select 'accounts_audit:'::text, au_aid, au_seqno, au_delta, au_user, au_time
Index: test_2_pgbench.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_2_pgbench.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_2_pgbench.in -Lsrc/ducttape/test_2_pgbench.in -u -w -r1.1 -r1.2
--- src/ducttape/test_2_pgbench.in
+++ src/ducttape/test_2_pgbench.in
@@ -365,7 +365,7 @@
kill $slon3_pid 2>/dev/null
echo -n "**** comparing databases ... "
-psql $DB1 >dump.tmp.1.$$ <<_EOF_
+psql $DB1 -o dump.tmp.1.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler
from accounts order by aid;
select 'branches:'::text, bid, bbalance, filler
@@ -375,7 +375,7 @@
select 'history:'::text, tid, bid, aid, delta, mtime, filler,
"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
_EOF_
-psql $DB2 >dump.tmp.2.$$ <<_EOF_
+psql $DB2 -o dump.tmp.2.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler
from accounts order by aid;
select 'branches:'::text, bid, bbalance, filler
@@ -385,7 +385,7 @@
select 'history:'::text, tid, bid, aid, delta, mtime, filler,
"_Slony-I_T1_rowID" from history order by "_Slony-I_T1_rowID";
_EOF_
-psql $DB3 >dump.tmp.3.$$ <<_EOF_
+psql $DB3 -o dump.tmp.3.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler
from accounts order by aid;
select 'branches:'::text, bid, bbalance, filler
Index: test_A_namequoting.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_A_namequoting.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_A_namequoting.in -Lsrc/ducttape/test_A_namequoting.in -u -w -r1.1 -r1.2
--- src/ducttape/test_A_namequoting.in
+++ src/ducttape/test_A_namequoting.in
@@ -285,7 +285,7 @@
kill $slon2_pid 2>/dev/null
echo -n "**** comparing databases ... "
-psql $DB1 >dump.tmp.1.$$ <<_EOF_
+psql $DB1 -o dump.tmp.1.$$ <<_EOF_
select id, "user"
from "Schema.name"."user" order by id;
select "user", description
@@ -293,7 +293,7 @@
select id, name, "eViL StudlyCaps.column"
from public.evil_index_table order by id;
_EOF_
-psql $DB2 >dump.tmp.2.$$ <<_EOF_
+psql $DB2 -o dump.tmp.2.$$ <<_EOF_
select id, "user"
from "Schema.name"."user" order by id;
select "user", description
Index: test_6_autolisten.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_6_autolisten.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_6_autolisten.in -Lsrc/ducttape/test_6_autolisten.in -u -w -r1.1 -r1.2
--- src/ducttape/test_6_autolisten.in
+++ src/ducttape/test_6_autolisten.in
@@ -381,7 +381,7 @@
echo -n "**** comparing databases ... "
for node in 1 2 3 4 5 6 ; do
- psql slony_test$node >dump.tmp.$node.$$ <<_EOF_
+ psql slony_test$node -o dump.tmp.$node.$$ <<_EOF_
select 'accounts:'::text, aid, bid, abalance, filler
from accounts order by aid;
select 'branches:'::text, bid, bbalance, filler
- Previous message: [Slony1-commit] By dpage: On Windows the line endings cause the cmp test to fail.
- Next message: [Slony1-commit] By cbbrowne: Make it clearer that test2 doesn't perform a useful test,
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list