From a745f0ba05a0bc94852d7de804591bacfa000c02 Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Tue, 8 May 2018 15:51:04 +0900 Subject: [PATCH] Fix test.sh in extended_query_test. It did not respect $PGPOOL_SETUP variable, which points to pgpool_setup in this source tree. Also fix error message normalize more complete so that unbale_bind test does not fail. --- src/test/extended-query-test/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/extended-query-test/test.sh b/src/test/extended-query-test/test.sh index d099175d1..9960d2efc 100755 --- a/src/test/extended-query-test/test.sh +++ b/src/test/extended-query-test/test.sh @@ -119,7 +119,7 @@ rm -fr testdata mkdir testdata cd testdata echo -n "creating test database..." -pgpool_setup > /dev/null 2>&1 +$PGPOOL_SETUP > /dev/null 2>&1 echo "done." cp etc/pgpool.conf pgpool.conf.back @@ -158,8 +158,8 @@ do echo "timeout." timeoutcnt=`expr $timeoutcnt + 1` else - sed -e 's/L [0-9]* R/L xxx R/' $expected/$i > expected_tmp - sed -e 's/L [0-9]* R/L xxx R/' $results/$i > results_tmp + sed -e 's/L [0-9]*/L xxx/g' $expected/$i > expected_tmp + sed -e 's/L [0-9]*/L xxx/g' $results/$i > results_tmp cmp expected_tmp results_tmp >/dev/null 2>&1 if [ $? != 0 ] then -- 2.39.5