pghs975uc
/
infer_clone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make buck tests more robust

Browse Source 
Summary: using 'buck clean' rather than 'rm -rf buck-out' makes buck happier, apply to all buck integration tests

Reviewed By: ngorogiannis

Differential Revision: D25558469

fbshipit-source-id: 6c07341d6
master
Martin Trojer 4 years ago committed by Facebook GitHub Bot
parent 4487513a2f
commit 212068f89b
14 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File

1
infer/tests/build_systems/buck-clang-db/Makefile
Unescape View File

@ -17,6 +17,7 @@ include $(TESTS_DIR)/infer.make
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) infer-out/report.json: $(CLANG_DEPS) $(SOURCES)
$(QUIET)cd $(SOURCE_DIR) && \ $(QUIET)cd $(SOURCE_DIR) && \
$(BUCK) clean && \
$(call silent_on_success,Testing Buck Clang compilation database integration,\ $(call silent_on_success,Testing Buck Clang compilation database integration,\
$(INFER_BIN) $(INFER_OPTIONS) -o $(CURDIR)/$(@D) \ $(INFER_BIN) $(INFER_OPTIONS) -o $(CURDIR)/$(@D) \
--buck-compilation-database no-deps \ --buck-compilation-database no-deps \

2
infer/tests/build_systems/buck_blacklist/Makefile
Unescape View File

@ -21,7 +21,7 @@ $(OBJECTS): $(JAVA_SOURCE_FILES)
$(BUCK) build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \ $(QUIET)$(BUCK) clean
$(call silent_on_success,Testing Buck flavors integration,\ $(call silent_on_success,Testing Buck flavors integration,\
$(INFER_BIN) $(INFER_OPTIONS) capture --buck-clang --results-dir $(CURDIR)/infer-out \ $(INFER_BIN) $(INFER_OPTIONS) capture --buck-clang --results-dir $(CURDIR)/infer-out \
@blacklist.txt --buck-blacklist '.*src/hello2\.c' \ @blacklist.txt --buck-blacklist '.*src/hello2\.c' \

7
infer/tests/build_systems/buck_clang_test_determinator/Makefile
Unescape View File

@ -25,12 +25,13 @@ $(DIFF_OUTPUT):
$(QUIET)echo >> diff.mod.test $(QUIET)echo >> diff.mod.test
$(TEST_DETERMINATOR_RESULT): $(DIFF_OUTPUT) $(TEST_DETERMINATOR_RESULT): $(DIFF_OUTPUT)
$(QUIET)$(call silent_on_success,Testing test-determinator for clang with set of changes,\ $(QUIET)$(BUCK) clean
$(INFER_BIN) $(INFER_OPTIONS) -- buck build --no-cache $(BUCK_TARGET)) $(call silent_on_success,Testing test-determinator for clang with set of changes,\
$(INFER_BIN) $(INFER_OPTIONS) -- $(BUCK) build --no-cache $(BUCK_TARGET))
.PHONY: test .PHONY: test
test: $(TEST_DETERMINATOR_RESULT) test: $(TEST_DETERMINATOR_RESULT)
$(QUIET)$(call check_no_diff,test_determinator.json.exp,$(TEST_DETERMINATOR_RESULT)) $(call check_no_diff,test_determinator.json.exp,$(TEST_DETERMINATOR_RESULT))
.PHONY: replace .PHONY: replace
replace: $(TEST_DETERMINATOR_RESULT) replace: $(TEST_DETERMINATOR_RESULT)

2
infer/tests/build_systems/buck_combined/Makefile
Unescape View File

@ -20,7 +20,7 @@ $(OBJECTS): $(SOURCES)
$(BUCK) build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \ $(QUIET)$(BUCK) clean
$(call silent_on_success,Testing infer-run Buck combined genrule integration,\ $(call silent_on_success,Testing infer-run Buck combined genrule integration,\
$(INFER_BIN) $(INFER_OPTIONS) run --results-dir $(CURDIR)/infer-out -- \ $(INFER_BIN) $(INFER_OPTIONS) run --results-dir $(CURDIR)/infer-out -- \
$(BUCK) build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))

7
infer/tests/build_systems/buck_export_changed_functions/Makefile
Unescape View File

@ -24,12 +24,13 @@ $(DIFF_OUTPUT):
$(QUIET)echo >> diff.mod.test $(QUIET)echo >> diff.mod.test
$(TEST_DETERMINATOR_RESULT): $(DIFF_OUTPUT) $(TEST_DETERMINATOR_RESULT): $(DIFF_OUTPUT)
$(QUIET)$(call silent_on_success,Testing export-changed-functions with set of changes,\ $(QUIET)$(BUCK) clean
$(INFER_BIN) $(INFER_OPTIONS) -- buck build --no-cache $(BUCK_TARGET)) $(call silent_on_success,Testing export-changed-functions with set of changes,\
$(INFER_BIN) $(INFER_OPTIONS) -- $(BUCK) build --no-cache $(BUCK_TARGET))
.PHONY: test .PHONY: test
test: $(TEST_DETERMINATOR_RESULT) test: $(TEST_DETERMINATOR_RESULT)
$(QUIET)$(call check_no_diff,changed_functions.json.exp,$(TEST_DETERMINATOR_RESULT)) $(call check_no_diff,changed_functions.json.exp,$(TEST_DETERMINATOR_RESULT))
.PHONY: replace .PHONY: replace
replace: $(TEST_DETERMINATOR_RESULT) replace: $(TEST_DETERMINATOR_RESULT)

2
infer/tests/build_systems/buck_flavors/Makefile
Unescape View File

@ -20,7 +20,7 @@ $(OBJECTS): $(JAVA_SOURCE_FILES)
$(BUCK) build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \ $(QUIET)$(BUCK) clean
$(call silent_on_success,Testing Buck flavors integration,\ $(call silent_on_success,Testing Buck flavors integration,\
$(INFER_BIN) $(INFER_OPTIONS) capture --buck-clang --results-dir $(CURDIR)/infer-out -- \ $(INFER_BIN) $(INFER_OPTIONS) capture --buck-clang --results-dir $(CURDIR)/infer-out -- \
$(BUCK) build --no-cache $(BUCK_TARGET) &&\ $(BUCK) build --no-cache $(BUCK_TARGET) &&\

2
infer/tests/build_systems/buck_flavors_diff/Makefile
Unescape View File

@ -39,7 +39,7 @@ print: current.exp.test previous.exp.test
replace: replace_reports replace: replace_reports
$(CURRENT_REPORT): $(CURRENT_REPORT):
$(QUIET)$(REMOVE_DIR) buck-out $(QUIET)$(BUCK) clean
$(QUIET)$(COPY) $(CODETOANALYZE)/some_bugs.c src/hello.c $(QUIET)$(COPY) $(CODETOANALYZE)/some_bugs.c src/hello.c
$(QUIET)$(call silent_on_success,Running Buck diff analysis: current,\ $(QUIET)$(call silent_on_success,Running Buck diff analysis: current,\
$(INFER_BIN) $(INFER_OPTIONS) run --results-dir $(CURRENT_DIR) -- \ $(INFER_BIN) $(INFER_OPTIONS) run --results-dir $(CURRENT_DIR) -- \

2
infer/tests/build_systems/buck_flavors_run/Makefile
Unescape View File

@ -20,7 +20,7 @@ $(OBJECTS): $(SOURCES)
$(BUCK) build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \ $(QUIET)$(BUCK) clean
$(call silent_on_success,Testing infer-run Buck flavors integration,\ $(call silent_on_success,Testing infer-run Buck flavors integration,\
$(INFER_BIN) $(INFER_OPTIONS) run --results-dir $(CURDIR)/infer-out --reactive -- \ $(INFER_BIN) $(INFER_OPTIONS) run --results-dir $(CURDIR)/infer-out --reactive -- \
$(BUCK) build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))

4
infer/tests/build_systems/buck_java_flavor/Makefile
Unescape View File

@ -16,6 +16,6 @@ INFER_OPTIONS = --buck-java-flavor --debug-exceptions
include $(TESTS_DIR)/infer.make include $(TESTS_DIR)/infer.make
$(INFER_OUT)/report.json: $(MAKEFILE_LIST) $(SOURCES) $(INFER_OUT)/report.json: $(MAKEFILE_LIST) $(SOURCES)
$(QUIET) $(REMOVE_DIR) buck-out && \ $(QUIET)$(BUCK) clean
$(call silent_on_success,Testing java flavor integration in $(TEST_REL_DIR),\ $(call silent_on_success,Testing java flavor integration in $(TEST_REL_DIR),\
$(INFER_BIN) --results-dir $(@D) $(INFER_OPTIONS) -- buck build --no-cache $(BUCK_TARGET)) $(INFER_BIN) --results-dir $(@D) $(INFER_OPTIONS) -- $(BUCK) build --no-cache $(BUCK_TARGET))

4
infer/tests/build_systems/genrulecapture/Makefile
Unescape View File

@ -15,7 +15,7 @@ INFER_OPTIONS = --buck-java --debug-exceptions
include $(TESTS_DIR)/infer.make include $(TESTS_DIR)/infer.make
$(INFER_OUT)/report.json: $(MAKEFILE_LIST) $(SOURCES) $(INFER_OUT)/report.json: $(MAKEFILE_LIST) $(SOURCES)
$(QUIET) $(REMOVE_DIR) buck-out && \ $(QUIET)$(BUCK) clean
$(call silent_on_success,Testing genrule capture integration in $(TEST_REL_DIR),\ $(call silent_on_success,Testing genrule capture integration in $(TEST_REL_DIR),\
$(INFER_BIN) --results-dir $(@D) $(INFER_OPTIONS) -- \ $(INFER_BIN) --results-dir $(@D) $(INFER_OPTIONS) -- \
buck build --no-cache $(BUCK_TARGET)) $(BUCK) build --no-cache $(BUCK_TARGET))

1
infer/tests/build_systems/objc_getters_setters/Makefile
Unescape View File

@ -17,6 +17,5 @@ include $(TESTS_DIR)/infer.make
include $(TESTS_DIR)/objc.make include $(TESTS_DIR)/objc.make
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \
$(call silent_on_success,Testing analysis with Objective-C getters and setters,\ $(call silent_on_success,Testing analysis with Objective-C getters and setters,\
$(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) $(SOURCES)) $(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) $(SOURCES))

1
infer/tests/build_systems/objc_missing_fld/Makefile
Unescape View File

@ -17,6 +17,5 @@ include $(TESTS_DIR)/infer.make
include $(TESTS_DIR)/objc.make include $(TESTS_DIR)/objc.make
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \
$(call silent_on_success,Testing analysis with Objective-C Missing_fld,\ $(call silent_on_success,Testing analysis with Objective-C Missing_fld,\
$(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) $(SOURCES)) $(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) $(SOURCES))

1
infer/tests/build_systems/objc_retain_cycles/Makefile
Unescape View File

@ -17,6 +17,5 @@ include $(TESTS_DIR)/infer.make
include $(TESTS_DIR)/objc.make include $(TESTS_DIR)/objc.make
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \
$(call silent_on_success,Testing analysis with Objective-C Retain cycles,\ $(call silent_on_success,Testing analysis with Objective-C Retain cycles,\
$(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) -fobjc-arc $(SOURCES)) $(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) -fobjc-arc $(SOURCES))

1
infer/tests/build_systems/objc_retain_cycles_weak/Makefile
Unescape View File

@ -17,6 +17,5 @@ include $(TESTS_DIR)/infer.make
include $(TESTS_DIR)/objc.make include $(TESTS_DIR)/objc.make
infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST) infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(MAKEFILE_LIST)
$(QUIET)$(REMOVE_DIR) buck-out && \
$(call silent_on_success,Testing analysis with Objective-C retain cycles on weak properties,\ $(call silent_on_success,Testing analysis with Objective-C retain cycles on weak properties,\
$(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) $(SOURCES)) $(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- clang $(CLANG_OPTIONS) $(SOURCES))

Write Preview
Loading…
Cancel
Save