Repair breakage of Wisconsin benchmark due to change of command line syntax

for standalone backends.

Although we probably ought to just remove this long-obsolete test case from
our code, it seems worthwhile to document the issue and fix in CVS first.

Jeff Janes

diff --git a/src/test/bench/create.sh b/src/test/bench/create.sh
index 9ce47ee837a0ee4c8b92f2f66d5d9e5a160a8ce4..de2ef09298450c5990d0b7776eba148745974e52 100755 (executable)
--- a/src/test/bench/create.sh
+++ b/src/test/bench/create.sh
@@ -10,16 +10,16 @@ if [ -d ./obj ]; then
 fi
 
 echo =============== destroying old bench database... =================
-echo "drop database bench" | postgres -D"$1" postgres > /dev/null
+echo "drop database bench" | postgres --single -D"$1" postgres > /dev/null
 
 echo =============== creating new bench database... =================
-echo "create database bench" | postgres -D"$1" postgres > /dev/null
+echo "create database bench" | postgres --single -D"$1" postgres > /dev/null
 if [ $? -ne 0 ]; then
        echo createdb failed
        exit 1
 fi
 
-postgres -D${1} bench < create.sql > /dev/null
+postgres --single -D${1} bench < create.sql > /dev/null
 if [ $? -ne 0 ]; then
        echo initial database load failed
        exit 1

diff --git a/src/test/bench/runwisc.sh b/src/test/bench/runwisc.sh
index efb919d36b791307254830b5d48a4021e1a3727b..6a9ccff249c27ddff3e90e7c6cb3308b6bc1f5b3 100755 (executable)
--- a/src/test/bench/runwisc.sh
+++ b/src/test/bench/runwisc.sh
@@ -11,7 +11,7 @@ if [ -d ./obj ]; then
 fi
 
 echo =============== vacuuming benchmark database... ================= >&2
-echo "vacuum" | postgres -D"$1" bench > /dev/null
+echo "vacuum" | postgres --single -D"$1" bench > /dev/null
 
 echo =============== running benchmark... ================= >&2
-time postgres -D"$1" -texecutor -tplanner -c log_min_messages=log -c log_destination=stderr -c start_log_collector=off bench < bench.sql 2>&1
+time postgres --single -D"$1" -texecutor -tplanner -c log_min_messages=log -c log_destination=stderr -c logging_collector=off bench < bench.sql 2>&1