pgpool2.git / summary / log / commit / refs

commit    38982dbc6dcd02d7ab5d4c6a79db6ec2313ebbfc
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Thu Aug 27 04:07:35 2015 +0000

    Fix regression test driver.
    
    In pgpool-II 3.5, libpcp.a is not compatible with previous ones. This
    results in segfault when pcp_recovery_node gets executed if the
    command links to older version of the library. Solution is, set
    ${PGPOOL_INSTALL_DIR}/lib to LD_LIBRARY_PATH so that the command links
    proper version of library.


 src/test/regression/regress.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/test/regression/regress.sh b/src/test/regression/regress.sh
index fe4529cbf..dbdae996c 100755
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -67,8 +67,15 @@ function export_env_vars
  	fi
 	
 	echo "using pgpool-II at "$PGPOOL_PATH
-    export PGPOOL_INSTALL_DIR=$PGPOOL_PATH
-	
+	export PGPOOL_INSTALL_DIR=$PGPOOL_PATH
+
+	PGPOOLLIB=${PGPOOL_INSTALL_DIR}/lib
+	if [ -z "$LD_LIBRARY_PATH" ];then
+	    export LD_LIBRARY_PATH=$PGPOOLLIB
+	else
+	    export LD_LIBRARY_PATH=${PGPOOLLIB}:${LD_LIBRARY_PATH}
+	fi
+
 	export TESTLIBS=$dir/libs.sh
 	export PGBIN=$PGBIN
 	export JDBC_DRIVER=$JDBC_DRIVER


[parent: 77529fe42e1e]