Fixed problem finding createdb and psql binaries.

[pspp-builds.git] / tests / command / get-data-psql.sh

diff --git a/tests/command/get-data-psql.sh b/tests/command/get-data-psql.sh
index 6b501025b8b6bd338fabd98bf55b4c1d5ea886e1..7735c36b04e2138ad958413eb1ce767643cf573a 100755 (executable)
--- a/tests/command/get-data-psql.sh
+++ b/tests/command/get-data-psql.sh
@@ -21,7 +21,7 @@ export LANG
 
 port=6543
 dbase=pspptest
-PG_CONFIG=pg_config
+PG_CONFIG=${PG_CONFIG:=pg_config}
 pgpath=`$PG_CONFIG | awk '/BINDIR/{print $3}'`
 
 cleanup()
@@ -78,11 +78,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="create database"
-createdb  -h $TEMPDIR  -p $port $dbase > /dev/null 2> /dev/null
+$pgpath/createdb  -h $TEMPDIR  -p $port $dbase > /dev/null 2> /dev/null
+if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="populate database"
-psql  -h $TEMPDIR -p $port  $dbase > /dev/null << EOF
+$pgpath/psql  -h $TEMPDIR -p $port  $dbase > /dev/null << EOF
 
 CREATE TABLE empty (a int, b date, c numeric(23, 4));