|
1 | 1 | #! /bin/sh |
2 | | -# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.48 2004/10/24 22:09:33 tgl Exp $ |
| 2 | +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.49 2004/10/31 19:14:16 tgl Exp $ |
3 | 3 |
|
4 | 4 | me=`basename$0` |
5 | 5 | :${TMPDIR=/tmp} |
|
414 | 414 | # wait forever, however. |
415 | 415 | i=0 |
416 | 416 | max=60 |
417 | | -until"$bindir/psql"$psql_options template1</dev/null2>/dev/null |
| 417 | +until"$bindir/psql"-X$psql_options template1</dev/null2>/dev/null |
418 | 418 | do |
419 | 419 | i=`expr$i + 1` |
420 | 420 | if [$i-ge$max ] |
@@ -470,14 +470,14 @@ else # not temp-install |
470 | 470 | if [-n"$PGHOST" ];then |
471 | 471 | echo"(using postmaster on$PGHOST,$port_info)" |
472 | 472 | else |
473 | | -case$host_platformin |
474 | | -*-*-mingw32*) |
475 | | -echo"(using postmaster on localhost socket,$port_info)" |
476 | | -;; |
477 | | -*) |
478 | | -echo"(using postmaster on Unix socket,$port_info)" |
479 | | -;; |
480 | | -esac |
| 473 | +case$host_platformin |
| 474 | +*-*-mingw32*) |
| 475 | +echo"(using postmaster on localhost socket,$port_info)" |
| 476 | +;; |
| 477 | +*) |
| 478 | +echo"(using postmaster on Unix socket,$port_info)" |
| 479 | +;; |
| 480 | +esac |
481 | 481 | fi |
482 | 482 | message"dropping database\"$dbname\"" |
483 | 483 | "$bindir/dropdb"$psql_options"$dbname" |
@@ -529,12 +529,12 @@ if [ $? -ne 0 ]; then |
529 | 529 | (exit 2);exit |
530 | 530 | fi |
531 | 531 |
|
532 | | -"$bindir/psql"$psql_options -c"\ |
| 532 | +"$bindir/psql"-q -X$psql_options -c"\ |
533 | 533 | checkpoint; |
534 | 534 | alter database\"$dbname\" set lc_messages to 'C'; |
535 | 535 | alter database\"$dbname\" set lc_monetary to 'C'; |
536 | 536 | alter database\"$dbname\" set lc_numeric to 'C'; |
537 | | -alter database\"$dbname\" set lc_time to 'C';""$dbname"2>/dev/null |
| 537 | +alter database\"$dbname\" set lc_time to 'C';""$dbname" |
538 | 538 | if [$?-ne 0 ];then |
539 | 539 | echo"$me: could not set database default locales" |
540 | 540 | (exit 2);exit |
|
546 | 546 | # ---------- |
547 | 547 |
|
548 | 548 | message"dropping regression test user accounts" |
549 | | -"$bindir/psql"$psql_options -c'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;'$dbname2>/dev/null |
| 549 | +"$bindir/psql"-q -X$psql_options -c'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;'$dbname2>/dev/null |
550 | 550 | if [$?-eq 2 ];then |
551 | 551 | echo"$me: could not drop user accounts" |
552 | 552 | (exit 2);exit |
|