From a851cb08d86a123bdc9bc2dd2f4c936799650c70 Mon Sep 17 00:00:00 2001
From: Bo Peng <pengbo@sraoss.co.jp>
Date: Thu, 13 Aug 2020 15:35:34 +0900
Subject: [PATCH] Before running regression test clean the remaining processes
 and sockets.

---
 src/test/regression/libs.sh    | 9 +++++++++
 src/test/regression/regress.sh | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/test/regression/libs.sh b/src/test/regression/libs.sh
index f7aeaad95..f0e5939c2 100644
--- a/src/test/regression/libs.sh
+++ b/src/test/regression/libs.sh
@@ -35,3 +35,12 @@ function wait_for_failover_done {
 		sleep 1
 	done
 }
+
+#-------------------------------------------
+# clean remaining processes and sockets
+#-------------------------------------------
+function clean_all {
+	pgrep pgpool | xargs kill -9 > /dev/null 2>&1
+	pgrep postgres | xargs kill -9 > /dev/null 2>&1
+	rm -f $PGSOCKET_DIR/.s.PGSQL.*
+}
diff --git a/src/test/regression/regress.sh b/src/test/regression/regress.sh
index 37efee029..b7b04dc24 100755
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -176,6 +176,7 @@ fi
 verify_pginstallation
 export_env_vars
 print_info
+source $TESTLIBS
 
 #Start executing tests
 rm -fr $log
@@ -193,6 +194,7 @@ for i in $dirs
 do
 	cd $i
 	echo -n "testing $i..."
+	clean_all
 	timeout $TIMEOUT ./test.sh > $log/$i 2>&1
 	rtn=$?
 	if [ $rtn = 0 ];then
-- 
2.39.5