[make] fix issues with `make clean && make -j test-replace`

Summary: There were issues, this fixes them.

Reviewed By: jeremydubreil

Differential Revision: D5776301

fbshipit-source-id: 72a7f5d

Makefile

@@ -13,7 +13,7 @@ include $(ROOT_DIR)/Makefile.config
 
 ifneq ($(UTOP),no)
 BUILD_SYSTEMS_TESTS += infertop
-build_infertop_print build_infertop_replace build_infertop_test: test_build
+build_infertop_print build_infertop_test: test_build
 endif
 
 ifeq ($(BUILD_C_ANALYZERS),yes)
@@ -88,9 +88,10 @@ BUILD_SYSTEMS_TESTS += buck genrule
 # Introduce the dependency only if the two tests are going to be built in parallel, so that they do
 # not run in parallel (otherwise Buck has a bad time). This works by checking if one of the main
 # testing targets was passed as a goal on the command line.
-ifneq ($(filter build_systems_tests config_tests test,${MAKECMDGOALS}),)
-build_genrule_test: build_buck_test
+ifneq ($(filter build_systems_tests config_tests test test-replace,${MAKECMDGOALS}),)
 build_genrule_print: build_buck_print
+build_genrule_replace: build_buck_replace
+build_genrule_test: build_buck_test
 endif
 endif
 ifneq ($(MVN),no)
@@ -102,9 +103,10 @@ ifeq ($(BUILD_C_ANALYZERS)+$(BUILD_JAVA_ANALYZERS),yes+yes)
 BUILD_SYSTEMS_TESTS += make utf8_in_pwd waf
 # the waf test and the make test run the same `make` command; use the same trick as for
 # "build_buck_test" to prevent make from running them in parallel
-ifneq ($(filter build_systems_tests config_tests test,${MAKECMDGOALS}),)
-build_waf_test: build_make_test
+ifneq ($(filter build_systems_tests config_tests test test-replace,${MAKECMDGOALS}),)
+build_waf_replace: build_make_replace
 build_waf_print: build_make_print
+build_waf_test: build_make_test
 endif
 endif
 

infer/tests/build_systems/differential_interesting_paths_filter/Makefile

@@ -22,7 +22,7 @@ compare_reports: current.exp.test previous.exp.test
 	$(QUIET)$(call check_no_diff,current.exp,current.exp.test)
 	$(QUIET)$(call check_no_diff,previous.exp,previous.exp.test)
 
-replace_reports:
+replace_reports: current.exp.test previous.exp.test
 	$(COPY) current.exp.test current.exp
 	$(COPY) previous.exp.test previous.exp