Fix 006.memqcache test.

It forgot to execute shutdownall if some of tests failed. This lead to
hang up of subsequent tests.

diff --git a/src/test/regression/tests/006.memqcache/test.sh b/src/test/regression/tests/006.memqcache/test.sh
index 9b213745f1834d19a7a1ebfc64ce0a7e4f4efffc..7f81e1f6721dc47154b80a059cdaa72a210312b2 100755 (executable)
--- a/src/test/regression/tests/006.memqcache/test.sh
+++ b/src/test/regression/tests/006.memqcache/test.sh
@@ -54,11 +54,16 @@ SELECT * FROM white_v;
 SELECT * FROM white_v;
 EOF
 
-       grep "fetched from cache" log/pgpool.log | grep t1 > /dev/null || exit 1
-       grep "fetched from cache" log/pgpool.log | grep black_t > /dev/null && exit 1
-       grep "fetched from cache" log/pgpool.log | grep normal_v > /dev/null && exit 1
-       grep "fetched from cache" log/pgpool.log | grep white_v > /dev/null || exit 1
-
+       success=true
+       grep "fetched from cache" log/pgpool.log | grep t1 > /dev/null || success=false
+       grep "fetched from cache" log/pgpool.log | grep black_t > /dev/null && success=false
+       grep "fetched from cache" log/pgpool.log | grep normal_v > /dev/null && success=false
+       grep "fetched from cache" log/pgpool.log | grep white_v > /dev/null || success=false
+       if [ $success = false ];then
+               ./shutdownall
+               exit 1
+       fi
+           
        java jdbctest > result.txt 2>&1
        cmp ../expected.txt result.txt
        if [ $? != 0 ];then