pgpool2.git / summary / log / commit / refs
commit f8d466fdf1ca9599f709f881914c6d69cac49871
Author: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Sat Aug 10 23:34:33 2019 +0000
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.
.../extra_scripts/disable-load-balance-always-black-function.data | 2 +-
.../extended-query-test/extra_scripts/disable-load-balance-always.data | 2 +-
.../extra_scripts/disable-load-balance-default-black-function.data | 2 +-
.../extra_scripts/disable-load-balance-default-simple.data | 2 +-
.../extended-query-test/extra_scripts/disable-load-balance-default.data | 2 +-
.../extra_scripts/disable-load-balance-off-black-function.data | 2 +-
.../extended-query-test/extra_scripts/disable-load-balance-off.data | 2 +-
.../extra_scripts/disable-load-balance-simple-black-function.data | 2 +-
.../extended-query-test/extra_scripts/disable-load-balance-simple.data | 2 +-
.../extra_scripts/disable-load-balance-trans-black-function.data | 2 +-
.../extra_scripts/disable-load-balance-white-function.data | 2 +-
src/test/extended-query-test/extra_scripts/disable-load-balance.data | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
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 85c833bb6..f384dbd70 100755
--- 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 c9eeb61cd..344e95c83 100755
--- 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 2cfb3970d..dac272956 100755
--- 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 5e91dc0ba..21b7482f9 100755
--- 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 b02acb563..14b2dd3c0 100755
--- 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 4e3093b40..d45ad3532 100755
--- 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 d0de7bec5..742754a84 100755
--- 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 de9091818..845f41fb1 100755
--- 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 cd351d2ac..40951c4f0 100755
--- 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 8f075ccf2..7f7d5ff51 100755
--- 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 10b46d286..549e5836d 100755
--- 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 c74fe4497..8d8ccdbf7 100755
--- 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
[parent: 276b42eef1ef]