From 1c9eab06d78100c92bbf227300676a86393d6dc9 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@meta.com>
Date: Tue, 16 May 2023 02:50:44 -0700
Subject: [PATCH] [tests] delete infer-out before running doli tests

Summary:
Otherwise sometimes the test results get polluted with a warning message about
infer-out/ being from a previous infer version. This is because issues.exp is
produced by capturing all console output from infer.

Reviewed By: geralt-encore

Differential Revision: D45903061

fbshipit-source-id: b60c8e306cc2154b7304f0a42e1568083adee2d5
---
 infer/tests/codetoanalyze/sil/doli-capture/Makefile | 13 +++++++------
 infer/tests/codetoanalyze/sil/doli-parsing/Makefile |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/infer/tests/codetoanalyze/sil/doli-capture/Makefile b/infer/tests/codetoanalyze/sil/doli-capture/Makefile
index 7cc28957ae6..8281e6538d5 100644
--- a/infer/tests/codetoanalyze/sil/doli-capture/Makefile
+++ b/infer/tests/codetoanalyze/sil/doli-capture/Makefile
@@ -16,20 +16,21 @@ CAPTURE_CMD = $(patsubst %.doli, --capture-doli  %.doli, $(SOURCES))
 
 CLEAN_EXTRA = $(CAPTURE_DIR)
 
-issues.exp.test: $(SOURCES) $(INFER_BIN)
-	$(INFER_BIN) -j 1 --quiet --no-progress-bar -o $(CAPTURE_DIR) $(CAPTURE_CMD) &> $@
+issues.exp.test$(TEST_SUFFIX): $(SOURCES) $(INFER_BIN)
+	$(QUIET)$(REMOVE_DIR) $(CAPTURE_DIR)
+	$(QUIET)$(INFER_BIN) -j 1 --quiet --no-progress-bar -o $(CAPTURE_DIR) $(CAPTURE_CMD) &> $@
 
 .PHONY: compile
-compile: issues.exp.test
+compile: issues.exp.test$(TEST_SUFFIX)
 
 .PHONY: test
-test: issues.exp.test
+test: issues.exp.test$(TEST_SUFFIX)
 	$(QUIET)cd $(TESTS_DIR) && \
 	$(call check_no_diff,$(TEST_REL_DIR)/issues.exp$(TEST_RESULT_SUFFIX),$(TEST_REL_DIR)/issues.exp.test$(TEST_SUFFIX))
 
 .PHONY: replace
-replace: issues.exp.test
-	cp $< issues.exp
+replace: issues.exp.test$(TEST_SUFFIX)
+	cp $< issues.exp$(TEST_RESULT_SUFFIX)
 
 .PHONY: clean
 clean:
diff --git a/infer/tests/codetoanalyze/sil/doli-parsing/Makefile b/infer/tests/codetoanalyze/sil/doli-parsing/Makefile
index abe4ee32ba5..d7684874cc3 100644
--- a/infer/tests/codetoanalyze/sil/doli-parsing/Makefile
+++ b/infer/tests/codetoanalyze/sil/doli-parsing/Makefile
@@ -21,12 +21,13 @@ analyze:
 print:
 
 .PHONY: test
-test: issues.exp.test
+test: issues.exp.test$(TEST_SUFFIX)
 	$(QUIET)cd $(TESTS_DIR) && \
 	$(call check_no_diff,$(TEST_REL_DIR)/issues.exp$(TEST_RESULT_SUFFIX),$(TEST_REL_DIR)/issues.exp.test$(TEST_SUFFIX))
 
-issues.exp.test: $(SOURCES) $(INFER_BIN)
-	@for f in $(SOURCES); do $(INFER_BIN) --parse-doli $${f}; done >& $@
+issues.exp.test$(TEST_SUFFIX): $(SOURCES) $(INFER_BIN)
+	$(QUIET)$(REMOVE_DIR) $(INFER_OUT)
+	@for f in $(SOURCES); do $(INFER_BIN) -o $(INFER_OUT) --parse-doli $${f}; done >& $@
 
 .PHONY: replace
 replace: issues.exp.test