Fix extra test scripts to not fail.

Now SELECT version() is always issued, this makes the script confused
because they extra lines in question by using "grep SELECT".  To avoid
the confusion, add "grep -v version" into the command pipe line.

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-always-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-always-black-function.data
index 85c833bb663a7a7ffb6a55ee30d33a70963f85b0..f384dbd708ff56062a806c83ddc28ef88e529a70 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-always-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-always-black-function.data
@@ -4,7 +4,7 @@
 # Parse: 0 Execute: 0 Parse: 0 Execute: 0 Parse: 0 Execute: 0
 set 0 0 0 0 0 0 0 0 0 0 0 0
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version|awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-always.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-always.data
index c9eeb61cd080bc6e4dbf21348fab9d93baf1e5bf..344e95c83dc2ef8ccd0183706fd8ed8c60517b15 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-always.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-always.data
@@ -5,7 +5,7 @@
 # SELECT: 0 SELECT: 0 SELECT: 0 SELECT: 0
 set 1 0 0 0 0 0 0 0 0 0 0 0 0 0
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data
index 2cfb3970d994078fac3a3ddc376cdab59e973eda..dac27295663bdebe13922b3a7529661619e5b242 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-default-black-function.data
@@ -5,7 +5,7 @@
 # Execute: 0 Parse: 0 Execute: 0
 set 0 1 0 0 0 0 0 0 1 1 0 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-default-simple.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-default-simple.data
index 5e91dc0ba9a67d050bc72d674e41b8a59bdf19d8..21b7482f9f56fb34f468eeb47a2801dc3608083d 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-default-simple.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-default-simple.data
@@ -3,7 +3,7 @@
 # expected results: SELECT: 1 SELECT: 0 SELECT: 1 SELECT: 1
 set 1 0 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data
index b02acb563865398dfca50f806c65d3fec43ed2ee..14b2dd3c082a0ffebedcdd71aef5897073f5d448 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-default.data
@@ -4,7 +4,7 @@
 # Parse: 1 Execute: 1 Parse: 1 Execute: 1 Parse: 1 Execute: 1
 set 1 0 0 0 0 1 1 1 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data
index 4e3093b40617b40954f4ef9ae6cbd0cc6def4d0d..d45ad3532182dac763549d45fe3efe1a1765841f 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-off-black-function.data
@@ -5,7 +5,7 @@
 # Execute: 1 Parse: 1 Execute: 1
 set 0 1 0 0 1 1 1 1 1 1 1 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-off.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-off.data
index d0de7bec590b6ddd1b5054ad204101df9b83ef6b..742754a84a6cc95d09bfda4399b608bf52a10079 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-off.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-off.data
@@ -5,7 +5,7 @@
 # SELECT: 1 SELECT: 1 SELECT: 1 SELECT: 1
 set 1 1 1 1 1 1 1 1 1 1 1 1 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-simple-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-simple-black-function.data
index de909181820ef46fae9dc308db09ad495f122eac..845f41fb163db67d858192506508eda6bb219273 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-simple-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-simple-black-function.data
@@ -3,7 +3,7 @@
 # expected results: CREATE: 0 SELECT: 1 SELECT: 0 SELECT: 0 SELECT: 1 SELECT: 1
 set 0 1 0 0 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-simple.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-simple.data
index cd351d2acc2b6c52680b83804319a48488fd7e05..40951c4f020dd2ece0c36b8de51460204951fc6d 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-simple.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-simple.data
@@ -3,7 +3,7 @@
 # expected results: SELECT: 1 SELECT: 0 SELECT: 1 SELECT: 0
 set 1 0 1 0
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data
index 8f075ccf2e26fc3e9d1c0ca61ee67e19e561062d..7f7d5ff51b7b39bd2d61d1fc79d89620c4109213 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-trans-black-function.data
@@ -5,7 +5,7 @@
 # Execute: 0 Parse: 0 Execute: 0
 set 0 1 0 0 0 0 0 0 1 1 0 0 0
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance-white-function.data b/src/test/extended-query-test/extra_scripts/disable-load-balance-white-function.data
index 10b46d28652b0104f344ff362ad5d461383e333d..549e5836dc3a9001cf41c704b94bb20f2a15da16 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance-white-function.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance-white-function.data
@@ -5,7 +5,7 @@
 # Parse: 1 Execute: 1 Parse: 1 Execute: 1
 set 0 1 1 1 1 1 1 1 1 1 1 1 1 1
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then

diff --git a/src/test/extended-query-test/extra_scripts/disable-load-balance.data b/src/test/extended-query-test/extra_scripts/disable-load-balance.data
index c74fe449714f675d52b8df667f5bd91e357bde2d..8d8ccdbf74b28c642f48bacadd00acd061f50a79 100755 (executable)
--- a/src/test/extended-query-test/extra_scripts/disable-load-balance.data
+++ b/src/test/extended-query-test/extra_scripts/disable-load-balance.data
@@ -4,7 +4,7 @@
 # Parse: 1 Execute: 1 Parse: 0 Execute: 0 Parse: 0 Execute: 0
 set 1 0 0 0 0 1 1 0 0 0 0
 
-grep "SELECT" $PGPOOLLOG |awk '{print $9}' | while read node
+grep "SELECT" $PGPOOLLOG | grep -v version |grep -v version|awk '{print $9}' | while read node
 do
     if [ $1 -ne $node ]
     then