diff --git a/infer/tests/build_systems/buck_flavors_diff/Makefile b/infer/tests/build_systems/buck_flavors_diff/Makefile index 074f952e5..222084f90 100644 --- a/infer/tests/build_systems/buck_flavors_diff/Makefile +++ b/infer/tests/build_systems/buck_flavors_diff/Makefile @@ -7,11 +7,12 @@ TESTS_DIR = ../.. INFER_OUT = infer-out -include $(TESTS_DIR)/differential.make - +SOURCES = $(SRC_DIR)/some_bugs.c $(SRC_DIR)/some_different_bugs.c DIFFERENTIAL_ARGS = --differential-filter-files changed_files.txt -include ../../differential.make +include $(TESTS_DIR)/differential.make + +$(CURRENT_REPORT) $(PREVIOUS_REPORT): $(CLANG_DEPS) BUCK_TARGET = //src:hello INFER_OPTIONS = $(DIFFERENTIAL_ARGS) --flavors --reactive --debug-exceptions diff --git a/infer/tests/build_systems/differential_interesting_paths_filter/Makefile b/infer/tests/build_systems/differential_interesting_paths_filter/Makefile index 3b663650e..28ff165fc 100644 --- a/infer/tests/build_systems/differential_interesting_paths_filter/Makefile +++ b/infer/tests/build_systems/differential_interesting_paths_filter/Makefile @@ -12,10 +12,14 @@ TESTS_DIR = ../.. MODIFIED_FILES_FILE = filter_files.test.txt DIFFERENTIAL_ARGS = --differential-filter-files $(MODIFIED_FILES_FILE) \ --differential-filter-set "fixed,preexisting" +SOURCES = $(wildcard src/com/example/*.java.current src/com/example/*.java.previous \ + src/com/example/*.java.unchanged) SRC_OBJECT_FILES = src/com/example/*.java src/com/example/*.class com/ CLEAN_EXTRA = $(SRC_OBJECT_FILES) $(MODIFIED_FILES_FILE) -include ../../differential.make +include $(TESTS_DIR)/differential.make + +$(CURRENT_REPORT) $(PREVIOUS_REPORT): $(JAVA_DEPS) .PHONY: compare_reports replace_reports compare_reports: current.exp.test previous.exp.test diff --git a/infer/tests/build_systems/differential_skip_anonymous_class_renamings/Makefile b/infer/tests/build_systems/differential_skip_anonymous_class_renamings/Makefile index 77b3782c4..343914958 100644 --- a/infer/tests/build_systems/differential_skip_anonymous_class_renamings/Makefile +++ b/infer/tests/build_systems/differential_skip_anonymous_class_renamings/Makefile @@ -8,9 +8,12 @@ # E2E test involving the skip_anonymous_class_renamings filter TESTS_DIR = ../.. +SOURCES = src/DiffExample.java.current src/DiffExample.java.previous CLEAN_EXTRA = src/Diff*.java *.class -include ../../differential.make +include $(TESTS_DIR)/differential.make + +$(CURRENT_REPORT) $(PREVIOUS_REPORT): $(JAVA_DEPS) $(CURRENT_REPORT): $(QUIET)$(COPY) src/DiffExample.java.current src/DiffExample.java diff --git a/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames/Makefile b/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames/Makefile index c047604c7..263ed0d7b 100644 --- a/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames/Makefile +++ b/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames/Makefile @@ -8,9 +8,12 @@ # E2E test involving the skip_duplicated_types_on_filenames filter TESTS_DIR = ../.. +SOURCES = $(wildcard src/*.java.current src/*.java.previous) CLEAN_EXTRA = src/Diff*.java src/Diff*.java *.class -include ../../differential.make +include $(TESTS_DIR)/differential.make + +$(CURRENT_REPORT) $(PREVIOUS_REPORT): $(JAVA_DEPS) $(CURRENT_REPORT): $(QUIET)$(COPY) src/DiffExample.java.current src/DiffExample.java diff --git a/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames_with_renamings/Makefile b/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames_with_renamings/Makefile index 018e1c054..7c460dcb2 100644 --- a/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames_with_renamings/Makefile +++ b/infer/tests/build_systems/differential_skip_duplicated_types_on_filenames_with_renamings/Makefile @@ -8,10 +8,13 @@ # E2E test involving the skip_duplicated_types_on_filenames filter TESTS_DIR = ../.. +SOURCES = $(wildcard src/*.java.current src/*.java.previous) DIFFERENTIAL_ARGS = --file-renamings file_renamings.json CLEAN_EXTRA = src/Diff*.java *.class -include ../../differential.make +include $(TESTS_DIR)/differential.make + +$(CURRENT_REPORT) $(PREVIOUS_REPORT): $(JAVA_DEPS) $(CURRENT_REPORT): $(QUIET)$(COPY) src/DiffExampleRenamed.java.current src/DiffExampleRenamed.java diff --git a/infer/tests/differential.make b/infer/tests/differential.make index fc9aac18e..82da956c5 100644 --- a/infer/tests/differential.make +++ b/infer/tests/differential.make @@ -29,6 +29,8 @@ $(PREVIOUS_REPORT): $(CURRENT_REPORT) .PHONY: analyze analyze: $(CURRENT_REPORT) $(PREVIOUS_REPORT) +$(CURRENT_REPORT) $(PREVIOUS_REPORT): $(INFER_BIN) $(SOURCES) + $(EXPECTED_TEST_OUTPUT): $(CURRENT_REPORT) $(PREVIOUS_REPORT) $(MODIFIED_FILES_FILE) \ $(INFER_BIN) $(MAKEFILE_LIST) $(QUIET)$(REMOVE_DIR) $(INFER_OUT)