diff options
| author | Nathan Cutler <ncutler@suse.com> | 2018-07-09 12:40:46 +0200 |
|---|---|---|
| committer | Nathan Cutler <ncutler@suse.com> | 2018-07-09 14:29:04 +0200 |
| commit | 458a0a6e6202ee9e976e19d7bc81652bf1b65c95 (patch) | |
| tree | 02bf1546529d3779adaa26c7e7746f96d3d6557a | |
| parent | cleanup: run-make-check.sh: no space between -D and name of cmake option (diff) | |
| download | ceph-458a0a6e6202ee9e976e19d7bc81652bf1b65c95.tar.xz ceph-458a0a6e6202ee9e976e19d7bc81652bf1b65c95.zip | |
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>
| -rwxr-xr-x | run-make-check.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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. |