pgpool2.git / summary / log / commit / refs
commit e4c3fc42aeaa0e7924c1c71819cdfd925e9d45d5
Author: Tatsuo Ishii <ishii@postgresql.org>
Date: Wed Jun 04 08:50:04 2014 +0000
Allow to run pgpool_setup and regression test on Ubuntu box.
Since Ubuntu's bash is in /usr/bin, and others have bash in /bin/, we
need to use env command to make the scripts more portable.
src/test/pgpool_setup | 3 ++-
src/test/regression/regress.sh | 1 +
src/test/regression/tests/001.load_balance/test.sh | 4 ++--
src/test/regression/tests/002.native_replication/test.sh | 4 ++--
src/test/regression/tests/003.failover/test.sh | 4 ++--
src/test/regression/tests/004.watchdog/test.sh | 6 +++---
src/test/regression/tests/005.jdbc/test.sh | 4 ++--
src/test/regression/tests/006.memqcache/test.sh | 4 ++--
src/test/regression/tests/050.bug58/test.sh | 4 ++--
src/test/regression/tests/051.bug60/test.sh | 4 ++--
src/test/regression/tests/052.do_query/test.sh | 4 ++--
src/test/regression/tests/053.insert_lock_hangs/test.sh | 4 ++--
src/test/regression/tests/054.postgres_fdw/test.sh | 4 ++--
src/test/regression/tests/055.backend_all_down/test.sh | 6 +++---
src/test/regression/tests/056.bug63/test.sh | 4 ++--
src/test/regression/tests/057.bug61/test.sh | 4 ++--
src/test/regression/tests/058.bug68/test.sh | 4 ++--
src/test/regression/tests/059.bug92/test.sh | 4 ++--
18 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index a655e76fd..0e67bce49 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -1,4 +1,5 @@
-#! /bin/sh
+#!/usr/bin/env bash
+#
# Copyright (c) 2013-2014 PgPool Global Development Group
#
# Permission to use, copy, modify, and distribute this software and
diff --git a/src/test/regression/regress.sh b/src/test/regression/regress.sh
old mode 100644
new mode 100755
index 21f1a7638..592240934
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
#
# pgpool-II regression test driver.
#
diff --git a/src/test/regression/tests/001.load_balance/test.sh b/src/test/regression/tests/001.load_balance/test.sh
index 5c279f09a..6d3412003 100755
--- a/src/test/regression/tests/001.load_balance/test.sh
+++ b/src/test/regression/tests/001.load_balance/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -x
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for load balancing.
#
@@ -14,7 +14,7 @@ do
# create test environment
echo -n "creating test environment..."
- sh $PGPOOL_SETUP -m $mode -n 2 || exit 1
+ $PGPOOL_SETUP -m $mode -n 2 || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/002.native_replication/test.sh b/src/test/regression/tests/002.native_replication/test.sh
index 6d9a463ef..e05912ba9 100755
--- a/src/test/regression/tests/002.native_replication/test.sh
+++ b/src/test/regression/tests/002.native_replication/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -x
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for native replication mode.
#
@@ -13,7 +13,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m r -n 2 || exit 1
+$PGPOOL_SETUP -m r -n 2 || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/003.failover/test.sh b/src/test/regression/tests/003.failover/test.sh
index 4b22edadb..460394ef0 100755
--- a/src/test/regression/tests/003.failover/test.sh
+++ b/src/test/regression/tests/003.failover/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for failover
#
@@ -15,7 +15,7 @@ do
# create test environment
echo -n "creating test environment..."
- sh $PGPOOL_SETUP -m $mode -n 2 --no-stop|| exit 1
+ $PGPOOL_SETUP -m $mode -n 2 --no-stop|| exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/004.watchdog/test.sh b/src/test/regression/tests/004.watchdog/test.sh
index ec1db6ffe..0119f5585 100755
--- a/src/test/regression/tests/004.watchdog/test.sh
+++ b/src/test/regression/tests/004.watchdog/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for watchdog
source $TESTLIBS
@@ -10,7 +10,7 @@ cd $TESTDIR
# create master environment
echo -n "creating master pgpool..."
-sh $PGPOOL_SETUP -m s -n 2 -p 11000|| exit 1
+$PGPOOL_SETUP -m s -n 2 -p 11000|| exit 1
echo "done."
source ./bashrc.ports
cat ../master.conf >> etc/pgpool.conf
@@ -26,7 +26,7 @@ rm -fr $sdir
mkdir $sdir
cd $sdir
echo -n "creating standby pgpool..."
-sh $PGPOOL_SETUP -m s -n 2 -p 11100|| exit 1
+$PGPOOL_SETUP -m s -n 2 -p 11100|| exit 1
echo "done."
source ./bashrc.ports
cat ../standby.conf >> etc/pgpool.conf
diff --git a/src/test/regression/tests/005.jdbc/test.sh b/src/test/regression/tests/005.jdbc/test.sh
index 6cf754afd..48d45f5ec 100755
--- a/src/test/regression/tests/005.jdbc/test.sh
+++ b/src/test/regression/tests/005.jdbc/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh -x
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for jdbc test
#
@@ -25,7 +25,7 @@ do
n=2
fi
- sh $PGPOOL_SETUP -m $mode -n $n || exit 1
+ $PGPOOL_SETUP -m $mode -n $n || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/006.memqcache/test.sh b/src/test/regression/tests/006.memqcache/test.sh
index 340ab57b4..34984b80e 100755
--- a/src/test/regression/tests/006.memqcache/test.sh
+++ b/src/test/regression/tests/006.memqcache/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for memqcache.
# requires Java PostgreSQL JDBC driver.
@@ -16,7 +16,7 @@ do
# create test environment
echo -n "creating test environment..."
- sh $PGPOOL_SETUP -m $mode -n 2 || exit 1
+ $PGPOOL_SETUP -m $mode -n 2 || exit 1
echo "done."
echo "memory_cache_enabled = on" >> etc/pgpool.conf
diff --git a/src/test/regression/tests/050.bug58/test.sh b/src/test/regression/tests/050.bug58/test.sh
index 8c8c3e9cd..15afb7c69 100755
--- a/src/test/regression/tests/050.bug58/test.sh
+++ b/src/test/regression/tests/050.bug58/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug#58
# 0000058: query cache invalidation does not fire for multiple DML in transaction
@@ -13,7 +13,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 1 --no-stop|| exit 1
+$PGPOOL_SETUP -m s -n 1 --no-stop|| exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/051.bug60/test.sh b/src/test/regression/tests/051.bug60/test.sh
index e82bdcf8d..b09d96d71 100755
--- a/src/test/regression/tests/051.bug60/test.sh
+++ b/src/test/regression/tests/051.bug60/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug reported in bug track #60
# The bug occurs when all of conditions below are met:
@@ -26,7 +26,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 2 --no-stop || exit 1
+$PGPOOL_SETUP -m s -n 2 --no-stop || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/052.do_query/test.sh b/src/test/regression/tests/052.do_query/test.sh
index f12bd89b1..9370b7b3b 100755
--- a/src/test/regression/tests/052.do_query/test.sh
+++ b/src/test/regression/tests/052.do_query/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for do_query.
#
@@ -17,7 +17,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 1 --no-stop|| exit 1
+$PGPOOL_SETUP -m s -n 1 --no-stop|| exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/053.insert_lock_hangs/test.sh b/src/test/regression/tests/053.insert_lock_hangs/test.sh
index b2d5b1f5c..daa811762 100755
--- a/src/test/regression/tests/053.insert_lock_hangs/test.sh
+++ b/src/test/regression/tests/053.insert_lock_hangs/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug reported in [pgpool-general: 1684].
# The bug occurs when all of conditions below are met:
@@ -20,7 +20,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m r -n 1 --no-stop|| exit 1
+$PGPOOL_SETUP -m r -n 1 --no-stop|| exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/054.postgres_fdw/test.sh b/src/test/regression/tests/054.postgres_fdw/test.sh
index db8cfa4b5..37847d47a 100755
--- a/src/test/regression/tests/054.postgres_fdw/test.sh
+++ b/src/test/regression/tests/054.postgres_fdw/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# Check to see if postgres_fdw works with pgpool-II. Since
# postres_fdw sets search_path to pg_catalog, pgpool_regclass() should
@@ -19,7 +19,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m r -n 2 --no-stop|| exit 1
+$PGPOOL_SETUP -m r -n 2 --no-stop|| exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/055.backend_all_down/test.sh b/src/test/regression/tests/055.backend_all_down/test.sh
index 7ccb0fac7..858563a49 100755
--- a/src/test/regression/tests/055.backend_all_down/test.sh
+++ b/src/test/regression/tests/055.backend_all_down/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# "pgpool -m f stop" hangs because unmanaged pgpool children remains.
# Starting pgpool without starting PostgreSQL servers triggers the bug.
@@ -14,7 +14,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 2 || exit 1
+$PGPOOL_SETUP -m s -n 2 || exit 1
echo "done."
source ./bashrc.ports
@@ -49,4 +49,4 @@ if [ $? = 0 ];then
fi
./shutdownall
-exit 0
\ No newline at end of file
+exit 0
diff --git a/src/test/regression/tests/056.bug63/test.sh b/src/test/regression/tests/056.bug63/test.sh
index 750cb65fe..483826895 100755
--- a/src/test/regression/tests/056.bug63/test.sh
+++ b/src/test/regression/tests/056.bug63/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug#63
# On memory query cache occasionally segfaults.
@@ -18,7 +18,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 1 || exit 1
+$PGPOOL_SETUP -m s -n 1 || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/057.bug61/test.sh b/src/test/regression/tests/057.bug61/test.sh
index a8453327f..416c81e27 100755
--- a/src/test/regression/tests/057.bug61/test.sh
+++ b/src/test/regression/tests/057.bug61/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug#61
# Child process xxxx was terminated by segmentation fault
@@ -16,7 +16,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 1 || exit 1
+$PGPOOL_SETUP -m s -n 1 || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/058.bug68/test.sh b/src/test/regression/tests/058.bug68/test.sh
index 85ca7d886..54b7d4968 100755
--- a/src/test/regression/tests/058.bug68/test.sh
+++ b/src/test/regression/tests/058.bug68/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug#68
# On memory query cache occasionally segfaults.
@@ -18,7 +18,7 @@ cd $TESTDIR
# create test environment
echo -n "creating test environment..."
-sh $PGPOOL_SETUP -m s -n 1 || exit 1
+$PGPOOL_SETUP -m s -n 1 || exit 1
echo "done."
source ./bashrc.ports
diff --git a/src/test/regression/tests/059.bug92/test.sh b/src/test/regression/tests/059.bug92/test.sh
index 232ef70ea..21c6c6080 100755
--- a/src/test/regression/tests/059.bug92/test.sh
+++ b/src/test/regression/tests/059.bug92/test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
#-------------------------------------------------------------------
# test script for bug#92
# JDBC DML fails under raw mode && autocommit mode.
@@ -21,7 +21,7 @@ do
# create test environment
echo -n "creating test environment..."
- sh $PGPOOL_SETUP -m $mode -n 2 || exit 1
+ $PGPOOL_SETUP -m $mode -n 2 || exit 1
echo "done."
source ./bashrc.ports
[parent: 4e56118ad418]