Permalink
Browse files

Specify the pg_config instead of --nosudo in db tests

  • Loading branch information...
1 parent 75d3ce6 commit 2c32522065a033f5fc9339c0f0c57be218e6a835 @dvarrazzo committed Jul 11, 2012
Showing with 6 additions and 5 deletions.
  1. +5 −5 dbtest/_test_template.sh
  2. +1 −0 dbtest/env.sh
View
@@ -1,16 +1,16 @@
echo "INSTALL"
-${PGXN} install --nosudo ${LEVEL} ${EXTENSION} || exit
+${PGXN} install --pg_config ${PG_CONFIG} ${LEVEL} ${EXTENSION} || exit
echo "CHECK"
-${PGXN} check ${TEST_DSN} ${LEVEL} ${EXTENSION}
+${PGXN} check --pg_config ${PG_CONFIG} ${TEST_DSN} ${LEVEL} ${EXTENSION}
echo "LOAD/UNLOAD"
dropdb -h ${PG_HOST} -p ${PG_PORT} ${TEST_DB}
createdb -h ${PG_HOST} -p ${PG_PORT} ${TEST_DB}
-${PGXN} load ${TEST_DSN} ${LEVEL} ${EXTENSION} || exit
-${PGXN} unload ${TEST_DSN} ${LEVEL} ${EXTENSION}
+${PGXN} load --pg_config ${PG_CONFIG} ${TEST_DSN} ${LEVEL} ${EXTENSION} || exit
+${PGXN} unload --pg_config ${PG_CONFIG} ${TEST_DSN} ${LEVEL} ${EXTENSION}
echo "UNINSTALL"
dropdb -h ${PG_HOST} -p ${PG_PORT} ${TEST_DB}
-${PGXN} uninstall --nosudo ${LEVEL} ${EXTENSION} || exit
+${PGXN} uninstall --pg_config ${PG_CONFIG} ${LEVEL} ${EXTENSION} || exit
View
@@ -1,5 +1,6 @@
export PG_VERSION=9.1.1
export PG_ROOT=`pwd`/postgresql-${PG_VERSION}/root/
+export PG_CONFIG=${PG_ROOT}/bin/pg_config
export PG_PORT=15432
export PG_HOST=localhost
export TEST_DB=contrib_regression

0 comments on commit 2c32522

Please sign in to comment.