From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 9 Jul 2018 10:40:46 +0000 (+0200)
Subject: run-make-check.sh: reset trap after sourcing install-deps.sh
X-Git-Tag: v14.0.1~911^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=458a0a6e6202ee9e976e19d7bc81652bf1b65c95;p=ceph.git

run-make-check.sh: reset trap after sourcing install-deps.sh

Since we source install-deps.sh, it replaces our trap with its own,
so we have to reinstate our trap after it finishes.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index d72bf5cfdcb..256df5e5ee8 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -84,6 +84,7 @@ function run() {
 
     if test -f ./install-deps.sh ; then
 	$DRY_RUN source ./install-deps.sh || return 1
+        trap clean_up_after_myself EXIT
     fi
 
     # Init defaults after deps are installed. get_processors() depends on coreutils nproc.