diff --git a/infer/tests/build_systems/buck/Makefile b/infer/tests/build_systems/buck/Makefile index 77dc4fb8c..090339b31 100644 --- a/infer/tests/build_systems/buck/Makefile +++ b/infer/tests/build_systems/buck/Makefile @@ -14,7 +14,7 @@ ANALYZER = infer SOURCES = $(wildcard $(TESTS_DIR)/codetoanalyze/java/infer/*.java) OBJECTS = $(ROOT_DIR)/buck-out/gen/infer/tests/codetoanalyze/java/infer/lib__compile__output/compile.jar INFERPRINT_OPTIONS = --project-root $(ROOT_DIR) --issues-tests -CLEAN_EXTRAS = $(ROOT_DIR)/buck-out/ $(CURDIR)/buck-out/ +CLEAN_EXTRA = $(ROOT_DIR)/buck-out/ $(CURDIR)/buck-out/ include $(TESTS_DIR)/java.make include $(TESTS_DIR)/base.make diff --git a/infer/tests/clang.make b/infer/tests/clang.make index 226e8b60f..af2a37727 100644 --- a/infer/tests/clang.make +++ b/infer/tests/clang.make @@ -8,6 +8,7 @@ ROOT_DIR = $(TESTS_DIR)/../.. OBJECTS = $(foreach source,$(SOURCES),$(basename $(source)).o) +CLEAN_EXTRA += duplicates.txt include $(TESTS_DIR)/base.make @@ -27,6 +28,3 @@ infer-out/report.json: $(CLANG_DEPS) $(SOURCES) %.o: %.mm clang++ $(CLANG_OPTIONS) -o $@ $< - -clean: - $(REMOVE) duplicates.txt diff --git a/infer/tests/codetoanalyze/objc/errors/Makefile b/infer/tests/codetoanalyze/objc/errors/Makefile index 4313546be..ec81b8dd5 100644 --- a/infer/tests/codetoanalyze/objc/errors/Makefile +++ b/infer/tests/codetoanalyze/objc/errors/Makefile @@ -16,7 +16,8 @@ CLANG_OPTIONS = -x objective-c \ -isysroot $(XCODEROOT)$(IPHONESIMULATOR_ISYSROOT_SUFFIX) \ -mios-simulator-version-min=8.2 --target=x86_64-apple-darwin14 -c \ -CLEAN_EXTRA = infer-out-arc infer-out-all +CLEAN_EXTRA = infer-out-arc infer-out-all infer-out-all infer-out-arc \ + issues.exp.test.all issues.exp.test.arc issues.exp.test.default INFER_OPTIONS = --cxx --check-duplicate-symbols --no-filtering --debug-exceptions INFERPRINT_OPTIONS = --issues-tests @@ -134,7 +135,3 @@ issues.exp.test: infer-out-all/report.json infer-out-arc/report.json infer-out/r $(INFERPRINT_BIN) -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.default \ --from-json-report infer-out/report.json cat $@.all $@.arc $@.default > $@ - -clean: - $(REMOVE_DIR) infer-out-all infer-out-arc - $(REMOVE) issues.exp.test.all issues.exp.test.arc issues.exp.test.default