Added "cd /" to the test scripts which don't already have it. This avoids warnings...

[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..fa61d6d684db5ee9ea1060ad6f6dd69cc31f2666 100755 (executable)
--- a/tests/command/get-data-psql.sh
+++ b/tests/command/get-data-psql.sh
@@ -21,8 +21,8 @@ export LANG
 
 port=6543
 dbase=pspptest
-PG_CONFIG=pg_config
-pgpath=`$PG_CONFIG | awk '/BINDIR/{print $3}'`
+PG_CONFIG=${PG_CONFIG:=pg_config}
+pgpath=`$PG_CONFIG --bindir`
 
 cleanup()
 {
@@ -31,6 +31,7 @@ cleanup()
        return ; 
     fi
     PGHOST=$TEMPDIR $pgpath/pg_ctl -D $TEMPDIR/cluster  stop -W -o "-k $TEMPDIR -h ''"   > /dev/null 2>&1
+    cd /
     rm -rf $TEMPDIR
 }
 
@@ -78,11 +79,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));