Permalink
Browse files

Fixed mess-up with db testing bin path

  • Loading branch information...
1 parent e560e22 commit 5e70b4e7e2d0c653b314edeaae8c1d2d5d0a614c @dvarrazzo committed Jul 11, 2012
Showing with 9 additions and 7 deletions.
  1. +5 −5 dbtest/_test_template.sh
  2. +4 −2 dbtest/env.sh
View
@@ -1,16 +1,16 @@
echo "INSTALL"
-${PGXN} install --pg_config ${PG_CONFIG} ${LEVEL} ${EXTENSION} || exit
+${PGXN} install ${LEVEL} ${EXTENSION} || exit
echo "CHECK"
-${PGXN} check --pg_config ${PG_CONFIG} ${TEST_DSN} ${LEVEL} ${EXTENSION}
+${PGXN} check ${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 --pg_config ${PG_CONFIG} ${TEST_DSN} ${LEVEL} ${EXTENSION} || exit
-${PGXN} unload --pg_config ${PG_CONFIG} ${TEST_DSN} ${LEVEL} ${EXTENSION}
+${PGXN} load ${TEST_DSN} ${LEVEL} ${EXTENSION} || exit
+${PGXN} unload ${TEST_DSN} ${LEVEL} ${EXTENSION}
echo "UNINSTALL"
dropdb -h ${PG_HOST} -p ${PG_PORT} ${TEST_DB}
-${PGXN} uninstall --pg_config ${PG_CONFIG} ${LEVEL} ${EXTENSION} || exit
+${PGXN} uninstall ${LEVEL} ${EXTENSION} || exit
View
@@ -1,10 +1,12 @@
export PG_VERSION=9.1.1
export PG_ROOT=`pwd`/postgresql-${PG_VERSION}/root/
-export PG_CONFIG=${PG_ROOT}/bin/pg_config
+export PATH=${PG_ROOT}/bin/:${PATH}
export PG_PORT=15432
export PG_HOST=localhost
export TEST_DB=contrib_regression
export TEST_DSN="-d ${TEST_DB} -h ${PG_HOST} -p ${PG_PORT}"
+
+# find the pgxn version to be tested
export PYTHONPATH=`pwd`/..:$PYTHONPATH
-export PATH=`pwd`/../bin:${PG_ROOT}/bin/:${PATH}
+export PATH=`pwd`/../bin:${PATH}
export PGXN=`which pgxn`

0 comments on commit 5e70b4e

Please sign in to comment.