From 40449fdd27d2af6979774facb265773c6e0e28ec Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Fri, 16 Nov 2018 14:50:38 -0800 Subject: [PATCH] Make coverity: do all compiles as one scan-build run In fed101920b6fbc7700aaa1175b6dbf88abbf920f, the coverity build process was modified to split out the build logs into separate files, instead of having one log file that gets overwritten repeatedly, making failures hard to debug. However, the coverity service gets upset if there is no file named with the expected build log name. Therefore, instead, we'll capture the python bits first, and then capture all the compilation bits in one cov-build command. PR: https://gitlab.com/apparmor/apparmor/merge_requests/273 Signed-off-by: Steve Beattie Acked-by: Christian Boltz --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e58004882..4453500ec 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,12 @@ snapshot: clean .PHONY: coverity coverity: snapshot cd $(SNAPSHOT_NAME)/libraries/libapparmor && ./configure --with-python - $(foreach dir, $(filter-out utils profiles tests, $(DIRS)), \ - cov-build --dir $(COVERITY_DIR) -- $(MAKE) -C $(SNAPSHOT_NAME)/$(dir); \ - mv $(COVERITY_DIR)/build-log.txt $(COVERITY_DIR)/build-log-$(subst /,.,$(dir)).txt ;) $(foreach dir, libraries/libapparmor utils, \ cov-build --dir $(COVERITY_DIR) --no-command --fs-capture-search $(SNAPSHOT_NAME)/$(dir); \ mv $(COVERITY_DIR)/build-log.txt $(COVERITY_DIR)/build-log-python-$(subst /,.,$(dir)).txt ;) + cov-build --dir $(COVERITY_DIR) -- sh -c \ + "$(foreach dir, $(filter-out utils profiles tests, $(DIRS)), \ + $(MAKE) -C $(SNAPSHOT_NAME)/$(dir);) " tar -cvzf $(SNAPSHOT_NAME)-$(COVERITY_DIR).tar.gz $(COVERITY_DIR) .PHONY: export_dir