From db4e84cf2f8de0909c3483c8cadb25ac72fb3367 Mon Sep 17 00:00:00 2001
From: Klement Sekera <ksekera@cisco.com>
Date: Fri, 11 Aug 2017 10:06:15 +0200
Subject: make test: properly handle ctrl-c

Change-Id: Iab88886ebc1582626813777ea45ce97fc8e36443
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---
 test/Makefile                            | 10 ++++++++-
 test/scripts/run_in_venv_with_cleanup.sh | 38 ++++++++++++++++++++++++++++++++
 test/scripts/run_with_cleanup.sh         | 25 ---------------------
 test/scripts/setsid_wrapper.sh           | 12 ++++++++++
 4 files changed, 59 insertions(+), 26 deletions(-)
 create mode 100755 test/scripts/run_in_venv_with_cleanup.sh
 delete mode 100755 test/scripts/run_with_cleanup.sh
 create mode 100755 test/scripts/setsid_wrapper.sh

diff --git a/test/Makefile b/test/Makefile
index d48a6b5a..33779dce 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -13,6 +13,14 @@ else
 VPP_PIDS=$(shell pgrep -d, -x vpp_main)
 endif
 
+ifeq ($(DEBUG),gdb)
+FORCE_FOREGROUND=1
+else ifeq ($(DEBUG),gdbserver)
+FORCE_FOREGROUND=1
+else
+FORCE_FOREGROUND=0
+endif
+
 verify-no-running-vpp:
 	@if [ "$(VPP_PIDS)" != "" ]; then \
 		echo; \
@@ -76,7 +84,7 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
 	@touch $@
 
 define retest-func
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && setsid scripts/run_with_cleanup.sh python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)"
+	@scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(PYTHON_VENV_PATH)/bin/activate python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)
 endef
 
 .PHONY: sanity
diff --git a/test/scripts/run_in_venv_with_cleanup.sh b/test/scripts/run_in_venv_with_cleanup.sh
new file mode 100755
index 00000000..541f584a
--- /dev/null
+++ b/test/scripts/run_in_venv_with_cleanup.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+rv=0
+
+atexit() {
+	group_id=`ps -p $$ -o pgid=`
+	my_id=$$
+	ids=`pgrep -g $group_id -d ' ' | sed "s/\b$my_id\b//g"`
+	echo "Killing possible remaining process IDs: $ids"
+	for id in $ids
+	do
+		if ps -p $id > /dev/null
+		then
+			kill -9 $id
+		fi
+	done
+	exit $rv
+}
+
+trap "atexit;" SIGINT SIGTERM
+
+FORCE_FOREGROUND=$1
+shift
+
+source $1
+shift
+
+if [[ "${FORCE_FOREGROUND}" == "1" ]]
+then
+	$*
+else
+	$* &
+	wait
+fi
+
+rv=$?
+atexit
+exit $rv
diff --git a/test/scripts/run_with_cleanup.sh b/test/scripts/run_with_cleanup.sh
deleted file mode 100755
index dcaa58b4..00000000
--- a/test/scripts/run_with_cleanup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-rv=0
-
-atexit() {
-	group_id=`ps -p $$ -o pgid=`
-	my_id=$$
-	ids=`pgrep -g $group_id -d ' ' | sed "s/\b$my_id\b//g"`
-	echo "Killing possible remaining process IDs: $ids"
-	for id in $ids
-	do
-		if ps -p $id > /dev/null
-		then
-			kill -9 $id
-		fi
-	done
-	exit $rv
-}
-
-trap "atexit" SIGINT SIGTERM
-
-$*
-rv=$?
-atexit
-exit $rv
diff --git a/test/scripts/setsid_wrapper.sh b/test/scripts/setsid_wrapper.sh
new file mode 100755
index 00000000..e18b6ad5
--- /dev/null
+++ b/test/scripts/setsid_wrapper.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ "$1" == "1" ]]
+then
+	setsid scripts/run_in_venv_with_cleanup.sh $*
+	pid=$!
+else
+	setsid scripts/run_in_venv_with_cleanup.sh $* &
+	pid=$!
+	trap "echo setsid_wrapper.sh: got signal, killing child pid ${pid}; kill ${pid}; sleep .1;" SIGINT SIGTERM
+	wait
+fi
-- 
cgit 1.2.3-korg