mirror of
https://github.com/postgres/postgres.git
synced 2025-06-11 20:28:21 +03:00
Fix omission of -X (--no-psqlrc) in some psql invocations.
As of commit d5563d7df
, psql -c no longer implies -X, but not all of
our regression testing scripts had gotten that memo.
To ensure consistency of results across different developers, make
sure that *all* invocations of psql in all scripts in our tree
use -X, even where this is not what previously happened.
Michael Paquier and Tom Lane
This commit is contained in:
@ -233,7 +233,7 @@ echo "ok"
|
||||
|
||||
# loadable module must be installed and not configured to permissive mode
|
||||
echo -n "checking sepgsql installation ... "
|
||||
VAL="`${CMD_PSQL} -t -c 'SHOW sepgsql.permissive' template1 2>/dev/null`"
|
||||
VAL="`${CMD_PSQL} -X -t -c 'SHOW sepgsql.permissive' template1 2>/dev/null`"
|
||||
RETVAL="$?"
|
||||
if [ $RETVAL -eq 2 ]; then
|
||||
echo "failed"
|
||||
@ -266,7 +266,7 @@ echo "ok"
|
||||
# NOTE: this test is wrong; we really ought to be checking template0.
|
||||
# But we can't connect to that without extra pushups, and it's not worth it.
|
||||
echo -n "checking for labels in template1 ... "
|
||||
NUM=`${CMD_PSQL} -At -c 'SELECT count(*) FROM pg_catalog.pg_seclabel' template1 2>/dev/null`
|
||||
NUM=`${CMD_PSQL} -XAt -c 'SELECT count(*) FROM pg_catalog.pg_seclabel' template1 2>/dev/null`
|
||||
if [ -z "${NUM}" ]; then
|
||||
echo "failed"
|
||||
echo ""
|
||||
|
Reference in New Issue
Block a user