diff options
author | Tom Lane | 2003-08-07 14:36:31 +0000 |
---|---|---|
committer | Tom Lane | 2003-08-07 14:36:31 +0000 |
commit | b830e933c013209da0150ecab11c7b15bfa5fe63 (patch) | |
tree | dbdbb9b7348c3be1401be49ebdde53566ddf4396 | |
parent | 2bc092d2f2625e5814d2aaee20d618e555a5d1b2 (diff) |
Remove unnecessary use of multiple cat processes to feed psql; this
reduces the number of concurrent processes launched during parallel
regression tests, possibly avoiding failures such as exceeding a user's
max number of processes. This essentially completes the reversion
of 1.27->1.28.
-rw-r--r-- | src/test/regress/pg_regress.sh | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index a229fa46ee..89eca95866 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.34 2003/07/31 19:20:41 tgl Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.35 2003/08/07 14:36:31 tgl Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -428,7 +428,7 @@ fi # Set up SQL shell for the test. # ---------- -PSQL="$bindir/psql -q -X $psql_options" +PSQL="$bindir/psql -a -q -X $psql_options" # ---------- @@ -552,22 +552,13 @@ do # Run a single test formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'` $ECHO_N "test $formatted ... $ECHO_C" - - (cat <<EOF -\\set ECHO all -EOF - cat "$inputdir/sql/$1.sql") | \ - $PSQL -d "$dbname" >"$outputdir/results/$1.out" 2>&1 + $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 else # Start a parallel group $ECHO_N "parallel group ($# tests): $ECHO_C" for name do ( - (cat <<EOF -\\set ECHO all -EOF - cat "$inputdir/sql/$name.sql") | \ - $PSQL -d $dbname >"$outputdir/results/$name.out" 2>&1 + $PSQL -d "$dbname" <"$inputdir/sql/$name.sql" >"$outputdir/results/$name.out" 2>&1 $ECHO_N " $name$ECHO_C" ) & done |