pgpool2.git / summary / log / commit / refs
commit 0241725bd968a3cf9c7254cdf9d71f038fbb9ca4
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Fri Aug 19 01:29:24 2016 +0000
Redirect output of make to log/regression.log.
This greatly reduces lengthy make output.
src/test/regression/regress.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/test/regression/regress.sh b/src/test/regression/regress.sh
index 6fc91b6bf..5d6f22704 100755
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -16,7 +16,7 @@ MODE=install
PG_INSTALL_DIR=/usr/local/pgsql/bin
PGPOOL_PATH=/usr/local
JDBC_DRIVER=/usr/local/pgsql/share/postgresql-9.2-1003.jdbc4.jar
-log=$dir/log
+export log=$dir/log
fail=0
ok=0
timeout=0
@@ -35,7 +35,12 @@ function install_pgpool
echo "creating pgpool-II temporary installation ..."
PGPOOL_PATH=$dir/temp/installed
- make install -C $dir/../../ -e prefix=${PGPOOL_PATH}
+ make install -C $dir/../../ -e prefix=${PGPOOL_PATH} >& $log/regression.log 2>&1
+
+ if [ $? != 0 ];then
+ echo "make install failed"
+ exit 1
+ fi
echo "moving pgpool_setup to temporary installation path ..."
cp $dir/../pgpool_setup ${PGPOOL_PATH}/pgpool_setup
[parent: d3211dcdedbf]