diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/GNUmakefile | 6 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 3388389147..5ed7c4ce2d 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -6,7 +6,7 @@ # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.54 2005/11/28 12:03:56 alvherre Exp $ +# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.55 2005/12/09 21:19:36 petere Exp $ # #------------------------------------------------------------------------- @@ -56,10 +56,10 @@ pg_regress: pg_regress.sh GNUmakefile $(top_builddir)/src/Makefile.global chmod a+x $@ install: pg_regress - $(INSTALL_SCRIPT) pg_regress $(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress + $(INSTALL_SCRIPT) pg_regress '$(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress' uninstall: - rm -f $(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress + rm -f '$(DESTDIR)$(pgxsdir)/$(subdir)/pg_regress' # Build dynamically-loaded object file for CREATE FUNCTION ... LANGUAGE 'C'. diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index 67d89215d0..12a80fdcfd 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.61 2005/11/01 15:09:11 adunstan Exp $ +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.62 2005/12/09 21:19:36 petere Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -507,7 +507,7 @@ fi # Set up SQL shell for the test. # ---------- -PSQL="$bindir/psql -a -q -X $psql_options" +psql_test_options="-a -q -X $psql_options" # ---------- @@ -635,7 +635,7 @@ do # Run a single test formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'` $ECHO_N "test $formatted ... $ECHO_C" - ( $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 )& + ( "$bindir/psql" $psql_test_options -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 )& wait else # Start a parallel group @@ -646,7 +646,7 @@ do fi for name do ( - $PSQL -d "$dbname" <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1 + "$bindir/psql" $psql_test_options -d "$dbname" <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1 $ECHO_N " $name$ECHO_C" ) & if [ $maxconnections -gt 0 ] ; then |