diff --git a/infer/models/java/Makefile b/infer/models/java/Makefile index bd989185f..ef348945a 100644 --- a/infer/models/java/Makefile +++ b/infer/models/java/Makefile @@ -30,7 +30,7 @@ $(INFER_REPORT): $(JAVA_DEPS_NO_MODELS) $(JAVA_SOURCES) $(MAKEFILE_LIST) $(QUIET)$(MKDIR_P) $(MODELS_OUT) $(QUIET)rm -f $(JAVA_MODELS_JAR) $(QUIET)$(call silent_on_success,Building Java models,\ - $(INFER_BIN) -a checkers --biabduction-only --results-dir $(INFER_RESULTS_DIR) --models-mode -- \ + $(INFER_BIN) --biabduction-only --results-dir $(INFER_RESULTS_DIR) --models-mode -- \ $(JAVAC) -bootclasspath $(ANDROID_JAR) -d $(MODELS_OUT) -classpath $(MODELS_CLASSPATH) \ $(JAVA_SOURCES) -source 7 -target 7) diff --git a/infer/src/labs/lab.md b/infer/src/labs/lab.md index f98284992..6f8708acb 100644 --- a/infer/src/labs/lab.md +++ b/infer/src/labs/lab.md @@ -132,7 +132,7 @@ void closeInCatchBad() { ``` (b) Try running on real code! The instructions [here](http://fm.csl.sri.com/SSFT17/infer-instr.html) have several suggestions for open-source Android apps to point your analysis at. Try `./gradlew assembleDebug -x test` first to make sure everything builds correctly without Infer (if not, you are probably missing some dependencies--the error messages should guide you). Once that's working, try -`./gradlew clean; infer -a checkers --resource-leak-only -- ./gradlew assembleDebug -x test`. +`./gradlew clean; infer run --resource-leak-only -- ./gradlew assembleDebug -x test`. - Found a real bug? Bonus points! Send a pull request to fix it! Very frequently, the best fix is to use try-with-resources. - Found a false positive in your analysis? Try re-running Infer with `--debug` and see if you can narrow down the root cause/fix it. - How does your analysis compare to Infer's production resource leak analysis? Run with `infer -- ` to see if your analysis finds bugs that Infer misses, or vice versa. diff --git a/infer/tests/build_systems/ant/Makefile b/infer/tests/build_systems/ant/Makefile index a77b325fc..f6b5e43c7 100644 --- a/infer/tests/build_systems/ant/Makefile +++ b/infer/tests/build_systems/ant/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers SOURCES = $(wildcard src/infer/*.java) OBJECTS = $(patsubst %.java,ant_out/%.class,$(SOURCES)) INFERPRINT_OPTIONS = --issues-tests @@ -18,7 +17,7 @@ $(OBJECTS): $(SOURCES) infer-out/report.json: $(JAVA_DEPS) $(SOURCES) $(QUIET)$(call silent_on_success,Testing ant integration,\ - $(INFER_BIN) -a $(ANALYZER) --project-root $(TESTS_DIR) -- $(ANT)) + $(INFER_BIN) --project-root $(TESTS_DIR) -- $(ANT)) clean: $(ANT) clean diff --git a/infer/tests/build_systems/assembly/Makefile b/infer/tests/build_systems/assembly/Makefile index 222b5de0b..04b51b243 100644 --- a/infer/tests/build_systems/assembly/Makefile +++ b/infer/tests/build_systems/assembly/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers CLANG_OPTIONS = -c INFER_OPTIONS = --report-custom-error --developer-mode --project-root ../codetoanalyze --Xclang -U --Xclang __SSE2__ INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/buck-clang-db/Makefile b/infer/tests/build_systems/buck-clang-db/Makefile index 0d00c93c5..b4283005d 100644 --- a/infer/tests/build_systems/buck-clang-db/Makefile +++ b/infer/tests/build_systems/buck-clang-db/Makefile @@ -7,7 +7,6 @@ TESTS_DIR = ../.. SOURCE_DIR = ../codetoanalyze -ANALYZER = checkers INFER_OPTIONS = --report-custom-error --developer-mode --project-root $(SOURCE_DIR) SOURCES = $(wildcard $(SOURCE_DIR)/*.cpp $(SOURCE_DIR)/*.h) OBJECTS = '$(SOURCE_DIR)/buck-out/gen/clang_compilation_database/__Hel lo\#compilation-database,x86_64.json' @@ -19,6 +18,6 @@ include $(TESTS_DIR)/infer.make infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(QUIET)cd $(SOURCE_DIR) && \ $(call silent_on_success,Testing Buck Clang compilation database integration,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o $(CURDIR)/$(@D) \ + $(INFER_BIN) $(INFER_OPTIONS) -o $(CURDIR)/$(@D) \ --buck-compilation-database no-deps \ -- $(BUCK) build --no-cache '//clang_compilation_database:Hel lo#default' @clang_compilation_database/buck_target_hello_test.txt) diff --git a/infer/tests/build_systems/buck/Makefile b/infer/tests/build_systems/buck/Makefile index 20f7a550b..48e5e0262 100644 --- a/infer/tests/build_systems/buck/Makefile +++ b/infer/tests/build_systems/buck/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers BUCK_TARGET = //infer/tests/build_systems/genrule/module2:module2 SOURCES = $(wildcard $(TESTS_DIR)/codetoanalyze/java/infer/*.java) OBJECTS = $(ROOT_DIR)/buck-out/gen/infer/tests/build_systems/genrule/module2/lib__module2__output/module2.jar @@ -28,5 +27,5 @@ infer-out/report.json: $(JAVA_DEPS) $(JAVA_SOURCE_FILES) $(REMOVE_DIR) buck-out && \ $(call silent_on_success,Testing Buck Java integration,\ INFER_BIN=$(INFER_BIN) \ - $(INFER_BIN) $(INFER_OPTIONS) -a $(ANALYZER) --results-dir $(CURDIR)/infer-out -- \ + $(INFER_BIN) $(INFER_OPTIONS) --results-dir $(CURDIR)/infer-out -- \ $(BUCK) build --deep --no-cache $(BUCK_TARGET)) diff --git a/infer/tests/build_systems/buck_cross_module/Makefile b/infer/tests/build_systems/buck_cross_module/Makefile index 916d31576..6c7fb2cda 100644 --- a/infer/tests/build_systems/buck_cross_module/Makefile +++ b/infer/tests/build_systems/buck_cross_module/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers BUCK_TARGET = //infer/tests/build_systems/buck_cross_module/module2:module2 INFERPRINT_OPTIONS = --project-root $(ROOT_DIR) --issues-tests CLEAN_EXTRA = $(ROOT_DIR)/buck-out @@ -25,5 +24,5 @@ infer-out/report.json: $(JAVA_DEPS) $(JAVA_SOURCE_FILES) $(REMOVE_DIR) buck-out && \ $(call silent_on_success,Testing Buck Java cross module integration,\ INFER_BIN=$(INFER_BIN) \ - $(INFER_BIN) -a $(ANALYZER) --results-dir $(CURDIR)/infer-out -- \ + $(INFER_BIN) --results-dir $(CURDIR)/infer-out -- \ $(BUCK) build --no-cache $(BUCK_TARGET)) diff --git a/infer/tests/build_systems/buck_flavors/Makefile b/infer/tests/build_systems/buck_flavors/Makefile index b8f655c2a..563dda80c 100644 --- a/infer/tests/build_systems/buck_flavors/Makefile +++ b/infer/tests/build_systems/buck_flavors/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers BUCK_TARGET = //src:hello @buck_target.txt SOURCES = $(wildcard src/*.c) $(wildcard src/subtarget1/*.c) $(wildcard src/subtarget2/*.c) OBJECTS = buck-out/gen/src/hello\#compile-hello.c.o1f717d69,default/hello.c.o diff --git a/infer/tests/build_systems/buck_flavors_deterministic/Makefile b/infer/tests/build_systems/buck_flavors_deterministic/Makefile index b1be2b41a..3abf7ee1a 100644 --- a/infer/tests/build_systems/buck_flavors_deterministic/Makefile +++ b/infer/tests/build_systems/buck_flavors_deterministic/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers BUCK_TARGET = //src:hello SOURCES = $(wildcard src/hello.c) OBJECTS = buck-out/gen/src/hello\#compile-hello.c.o1f717d69,default/hello.c.o diff --git a/infer/tests/build_systems/buck_flavors_run/Makefile b/infer/tests/build_systems/buck_flavors_run/Makefile index c7007015e..4537af1ed 100644 --- a/infer/tests/build_systems/buck_flavors_run/Makefile +++ b/infer/tests/build_systems/buck_flavors_run/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers BUCK_TARGET = //src:hello SOURCES = src/hello.c src/hello2.c OBJECTS = buck-out/gen/src/hello\#compile-hello.c.o1f717d69,default/hello.c.o diff --git a/infer/tests/build_systems/buck_javac_jar/Makefile b/infer/tests/build_systems/buck_javac_jar/Makefile index 5e8b9e4a7..e06f63737 100644 --- a/infer/tests/build_systems/buck_javac_jar/Makefile +++ b/infer/tests/build_systems/buck_javac_jar/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers TARGET = //src:target SOURCES = src/UsingJavacJar.java OBJECTS = buck-out/gen/src/lib__target__output/target.jar diff --git a/infer/tests/build_systems/ck_analytics/Makefile b/infer/tests/build_systems/ck_analytics/Makefile index 040b47fcc..a05254824 100644 --- a/infer/tests/build_systems/ck_analytics/Makefile +++ b/infer/tests/build_systems/ck_analytics/Makefile @@ -5,12 +5,10 @@ TESTS_DIR = ../.. -ANALYZER = linters - CODETOANALYZE_DIR = ../codetoanalyze/componentkit CLANG_OPTIONS = -x objective-c++ -std=c++11 -c -fblocks -INFER_OPTIONS = --no-filtering --compute-analytics --project-root $(CODETOANALYZE_DIR) +INFER_OPTIONS = --no-capture --linters-only --no-filtering --compute-analytics --project-root $(CODETOANALYZE_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = $(CODETOANALYZE_DIR)/TestComponentKitAnalytics.mm diff --git a/infer/tests/build_systems/ck_imports/Makefile b/infer/tests/build_systems/ck_imports/Makefile index 46fbcaacd..0013e89e1 100644 --- a/infer/tests/build_systems/ck_imports/Makefile +++ b/infer/tests/build_systems/ck_imports/Makefile @@ -5,12 +5,10 @@ TESTS_DIR = ../.. -ANALYZER = linters - CODETOANALYZE_DIR = ../codetoanalyze/componentkit CLANG_OPTIONS = -x objective-c++ -std=c++11 -c -fblocks -INFER_OPTIONS = --no-filtering --project-root $(CODETOANALYZE_DIR) +INFER_OPTIONS = --no-capture --linters-only --no-filtering --project-root $(CODETOANALYZE_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = $(CODETOANALYZE_DIR)/TestIgnoreImports.mm diff --git a/infer/tests/build_systems/clang_compilation_db/Makefile b/infer/tests/build_systems/clang_compilation_db/Makefile index c78873f21..3386d9bab 100644 --- a/infer/tests/build_systems/clang_compilation_db/Makefile +++ b/infer/tests/build_systems/clang_compilation_db/Makefile @@ -8,7 +8,6 @@ TESTS_DIR = ../.. CMAKE_DIR = ../codetoanalyze/clang_compilation_database CMAKE_BUILD_DIR = $(CMAKE_DIR)/_build_infer -ANALYZER = checkers CLEAN_EXTRA = $(CMAKE_BUILD_DIR) INFER_OPTIONS = --report-custom-error --developer-mode --project-root $(CMAKE_DIR) SOURCES = $(CMAKE_DIR)/hello.cpp @@ -30,23 +29,23 @@ infer-out/report.json: infer-out-with-index/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json $(CLANG_DEPS) $(SOURCES) $(QUIET)$(call silent_on_success,Testing Clang compilation database with index integration,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o $(@D) \ + $(INFER_BIN) $(INFER_OPTIONS) -o $(@D) \ --changed-files-index $(CMAKE_DIR)/index.txt --compilation-database $<) infer-out-no-index/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json $(CLANG_DEPS) $(SOURCES) $(QUIET)$(call silent_on_success,Testing Clang compilation database integration,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o $(@D) --compilation-database $<) + $(INFER_BIN) $(INFER_OPTIONS) -o $(@D) --compilation-database $<) infer-out-reactive-capture/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json $(CLANG_DEPS) $(SOURCES) $(QUIET)$(call silent_on_success,Testing Clang compilation database reactive capture integration,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o $(@D) --reactive-capture \ + $(INFER_BIN) $(INFER_OPTIONS) -o $(@D) --reactive-capture \ --changed-files-index $(CMAKE_DIR)/index.txt --compilation-database $<) issues.exp.test: infer-out-with-index/report.json infer-out-no-index/report.json infer-out-reactive-capture/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.with-index \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.with-index \ -o infer-out-with-index --from-json-report infer-out-with-index/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.no-index \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.no-index \ -o infer-out-no-index --from-json-report infer-out-no-index/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.reactive-capture \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.reactive-capture \ -o infer-out-reactive-capture --from-json-report infer-out-reactive-capture/report.json $(QUIET)cat $@.with-index $@.no-index $@.reactive-capture > $@ diff --git a/infer/tests/build_systems/clang_compilation_db_escaped/Makefile b/infer/tests/build_systems/clang_compilation_db_escaped/Makefile index ade6c24d5..36a84fafe 100644 --- a/infer/tests/build_systems/clang_compilation_db_escaped/Makefile +++ b/infer/tests/build_systems/clang_compilation_db_escaped/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers INFER_OPTIONS = --report-custom-error --developer-mode SOURCES = ../codetoanalyze/path\ with\ spaces/hel\ lo.c OBJECTS = $(SOURCES:.c=.o) @@ -27,5 +26,5 @@ compile_commands.json: compile_commands.json.in infer-out/report.json: compile_commands.json $(SOURCES) Makefile \ ../codetoanalyze/path\ with\ spaces/hel\ lo.c $(CLANG_DEPS) $(QUIET)$(call silent_on_success,Clang compilation database escaped integration,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) --project-root $(TESTS_DIR) \ + $(INFER_BIN) $(INFER_OPTIONS) --project-root $(TESTS_DIR) \ --compilation-database-escaped $<) diff --git a/infer/tests/build_systems/clang_compilation_db_relpath/Makefile b/infer/tests/build_systems/clang_compilation_db_relpath/Makefile index 266524eaa..6332a1101 100644 --- a/infer/tests/build_systems/clang_compilation_db_relpath/Makefile +++ b/infer/tests/build_systems/clang_compilation_db_relpath/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers INFER_OPTIONS = --report-custom-error --developer-mode SOURCES = \ ../codetoanalyze/hello.c ../codetoanalyze/hello2.c ../codetoanalyze/hello3.c \ @@ -31,5 +30,5 @@ compile_commands.json: compile_commands.json.in infer-out/report.json: compile_commands.json $(SOURCES) Makefile \ ../codetoanalyze/path\ with\ spaces/hel\ lo.c $(CLANG_DEPS) $(QUIET)$(call silent_on_success,Clang compilation database with relative paths integration,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) --project-root $(TESTS_DIR) \ + $(INFER_BIN) $(INFER_OPTIONS) --project-root $(TESTS_DIR) \ --compilation-database $<) diff --git a/infer/tests/build_systems/clang_multiple_files/Makefile b/infer/tests/build_systems/clang_multiple_files/Makefile index 82ccaa11e..2c8bc0dd6 100644 --- a/infer/tests/build_systems/clang_multiple_files/Makefile +++ b/infer/tests/build_systems/clang_multiple_files/Makefile @@ -5,8 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers - CLANG_OPTIONS = -c INFER_OPTIONS = --project-root ../codetoanalyze INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/clang_unknown_ext/Makefile b/infer/tests/build_systems/clang_unknown_ext/Makefile index 5b73871f8..bafd286a2 100644 --- a/infer/tests/build_systems/clang_unknown_ext/Makefile +++ b/infer/tests/build_systems/clang_unknown_ext/Makefile @@ -5,8 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers - CLANG_OPTIONS = -x c -c INFER_OPTIONS = --project-root ../codetoanalyze INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/clang_with_E_flag/Makefile b/infer/tests/build_systems/clang_with_E_flag/Makefile index 2236b0cf3..328045487 100644 --- a/infer/tests/build_systems/clang_with_E_flag/Makefile +++ b/infer/tests/build_systems/clang_with_E_flag/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers CLANG_OPTIONS = -E -c INFER_OPTIONS = --report-custom-error --developer-mode --project-root ../codetoanalyze INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/clang_with_MD_flag/Makefile b/infer/tests/build_systems/clang_with_MD_flag/Makefile index 4386797ed..57b747c87 100644 --- a/infer/tests/build_systems/clang_with_MD_flag/Makefile +++ b/infer/tests/build_systems/clang_with_MD_flag/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers CLANG_OPTIONS = -MD -c INFER_OPTIONS = --report-custom-error --developer-mode --project-root ../codetoanalyze INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/clang_with_M_flag/Makefile b/infer/tests/build_systems/clang_with_M_flag/Makefile index 8eb22ce26..779a685cd 100644 --- a/infer/tests/build_systems/clang_with_M_flag/Makefile +++ b/infer/tests/build_systems/clang_with_M_flag/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers CLANG_OPTIONS = -M -c INFER_OPTIONS = --report-custom-error --developer-mode --project-root ../codetoanalyze INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/clang_with_blacklisted_flags/Makefile b/infer/tests/build_systems/clang_with_blacklisted_flags/Makefile index 02316214e..3dfd060b7 100644 --- a/infer/tests/build_systems/clang_with_blacklisted_flags/Makefile +++ b/infer/tests/build_systems/clang_with_blacklisted_flags/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers # The "-index-store-path " argument does not exist in Clang and it gets # discarded without any error message. The problem is that its argument, # a folder, is not discarded, and Clang considers it as a source file. This diff --git a/infer/tests/build_systems/cmake/Makefile b/infer/tests/build_systems/cmake/Makefile index 43d0356ac..518878324 100644 --- a/infer/tests/build_systems/cmake/Makefile +++ b/infer/tests/build_systems/cmake/Makefile @@ -9,7 +9,6 @@ CMAKE_DIR = ../codetoanalyze/cmake CMAKE_BUILD_DIR = $(CMAKE_DIR)/_build CMAKE_ANALYZE_DIR = $(CMAKE_DIR)/_build_infer -ANALYZER = checkers CLEAN_EXTRA = $(CMAKE_BUILD_DIR) $(CMAKE_ANALYZE_DIR) INFER_OPTIONS = --project-root $(TESTS_DIR) SOURCES = $(CMAKE_DIR)/hello.c @@ -35,6 +34,6 @@ infer-out/report.json: $(SOURCES) $(CMAKE_DIR)/CMakeLists.txt $(CLANG_DEPS) $(call silent_on_success,Testing CMake integration: Generate Makefiles,\ $(INFER_BIN) compile $(INFER_OPTIONS) -- cmake ..) $(QUIET)$(call silent_on_success,Testing CMake integration: Run Makefiles,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -- $(MAKE) -C $(CMAKE_ANALYZE_DIR)) + $(INFER_BIN) $(INFER_OPTIONS) -- $(MAKE) -C $(CMAKE_ANALYZE_DIR)) # cmake makes all paths absolute $(QUIET)sed -i -e 's#$(abspath $(TESTS_DIR))/##g' $@ diff --git a/infer/tests/build_systems/deduplicate_template_warnings/Makefile b/infer/tests/build_systems/deduplicate_template_warnings/Makefile index 6d5b4f531..ddfea196a 100644 --- a/infer/tests/build_systems/deduplicate_template_warnings/Makefile +++ b/infer/tests/build_systems/deduplicate_template_warnings/Makefile @@ -5,8 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers - CLANG_OPTIONS = -c INFER_OPTIONS = --project-root src --liveness INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/delete_results_dir/Makefile b/infer/tests/build_systems/delete_results_dir/Makefile index c4d2a3cb3..7652fc428 100644 --- a/infer/tests/build_systems/delete_results_dir/Makefile +++ b/infer/tests/build_systems/delete_results_dir/Makefile @@ -8,8 +8,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers - CODETOANALYZE_DIR = ../codetoanalyze CLANG_OPTIONS = -c @@ -22,8 +20,8 @@ include $(TESTS_DIR)/clang.make infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(QUIET)$(call silent_on_success,Testing that infer deletes the results directory: part 1/2,\ - $(INFER_BIN) --dump-duplicate-symbols $(INFER_OPTIONS) -a $(ANALYZER) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello.c) + $(INFER_BIN) --dump-duplicate-symbols $(INFER_OPTIONS) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello.c) $(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt) $(QUIET)$(call silent_on_success,Testing that infer deletes the results directory: part 2/2,\ - $(INFER_BIN) --dump-duplicate-symbols $(INFER_OPTIONS) -a $(ANALYZER) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello2.c) + $(INFER_BIN) --dump-duplicate-symbols $(INFER_OPTIONS) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello2.c) $(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt) diff --git a/infer/tests/build_systems/fail_on_issue/Makefile b/infer/tests/build_systems/fail_on_issue/Makefile index e1a90c410..14b6d4497 100644 --- a/infer/tests/build_systems/fail_on_issue/Makefile +++ b/infer/tests/build_systems/fail_on_issue/Makefile @@ -7,8 +7,6 @@ TESTS_DIR = ../.. include $(TESTS_DIR)/base.make -ANALYZER = checkers - CODETOANALYZE_DIR = ../codetoanalyze CLANG_OPTIONS = -c diff --git a/infer/tests/build_systems/genrule/Makefile b/infer/tests/build_systems/genrule/Makefile index 025464188..b68c31efb 100644 --- a/infer/tests/build_systems/genrule/Makefile +++ b/infer/tests/build_systems/genrule/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = infer BUCK_TARGET = //infer/tests/build_systems/genrule/module2:module2 INFER_TARGET = $(BUCK_TARGET)_infer SOURCES = $(wildcard $(TESTS_DIR)/codetoanalyze/java/infer/*.java) @@ -41,5 +40,5 @@ report.json: $(JSON_REPORT) $(MAKEFILE_LIST) $(QUIET)sed -e 's#$(abspath $(TESTS_DIR))/##g' $< > $@ issues.exp.test$(TEST_SUFFIX): report.json $(INFER_BIN) - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) \ + $(QUIET)$(INFER_BIN) report -q \ $(INFERPRINT_OPTIONS) $@ --from-json-report $< diff --git a/infer/tests/build_systems/gradle/Makefile b/infer/tests/build_systems/gradle/Makefile index 87a261ac2..a498d7b49 100644 --- a/infer/tests/build_systems/gradle/Makefile +++ b/infer/tests/build_systems/gradle/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers SOURCES_DIR = $(ROOT_DIR)/examples/java_hello SOURCES = $(wildcard $(SOURCES_DIR)/*.java) # no objects since we only run a mock gradle that cannot compile Java sources @@ -21,4 +20,4 @@ infer-out/report.json: $(JAVA_DEPS) $(SOURCES) $(MAKEFILE_LIST) $(QUIET)PATH=$(CURDIR)/../mock:"$$PATH"; \ cd $(SOURCES_DIR) && \ $(call silent_on_success,Testing gradle Java integration,\ - $(INFER_BIN) -a $(ANALYZER) --results-dir $(CURDIR)/infer-out -- gradle build) + $(INFER_BIN) --results-dir $(CURDIR)/infer-out -- gradle build) diff --git a/infer/tests/build_systems/inferconfig/Makefile b/infer/tests/build_systems/inferconfig/Makefile index a3ad72fa4..c306609f1 100644 --- a/infer/tests/build_systems/inferconfig/Makefile +++ b/infer/tests/build_systems/inferconfig/Makefile @@ -8,7 +8,6 @@ TESTS_DIR = ../.. CMAKE_DIR = $(CURDIR)/../codetoanalyze/clang_compilation_database CMAKE_BUILD_DIR = $(CURDIR)/_build_infer -ANALYZER = checkers CLEAN_EXTRA = $(CMAKE_BUILD_DIR) INFER_OPTIONS = --report-custom-error --developer-mode --project-root $(CMAKE_DIR) SOURCES = $(CMAKE_DIR)/hello.cpp @@ -29,5 +28,5 @@ infer-out/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json $(CLANG_DEPS) $( # test that config/infer.conf is read and paths inside it are interpreted relative to its # location $(QUIET)$(call silent_on_success,Testing Clang compilation database with index integration,\ - INFERCONFIG=config/infer.conf $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) -o $(@D) \ + INFERCONFIG=config/infer.conf $(INFER_BIN) $(INFER_OPTIONS) -o $(@D) \ --compilation-database $<) diff --git a/infer/tests/build_systems/javac/Makefile b/infer/tests/build_systems/javac/Makefile index 7624df68a..74006f8bd 100644 --- a/infer/tests/build_systems/javac/Makefile +++ b/infer/tests/build_systems/javac/Makefile @@ -6,7 +6,6 @@ TESTS_DIR = ../.. ROOT_DIR = $(TESTS_DIR)/../.. -ANALYZER = checkers INFER_OPTIONS = INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/build_systems/linters/Makefile b/infer/tests/build_systems/linters/Makefile index 9a024932c..60c28c9ae 100644 --- a/infer/tests/build_systems/linters/Makefile +++ b/infer/tests/build_systems/linters/Makefile @@ -6,9 +6,8 @@ SYM_ROOT = ../codetoanalyze/linters/tsrc_symlink TESTS_DIR = ../.. -ANALYZER = linters CLANG_OPTIONS = -x objective-c++ -std=c++11 -fblocks -c -INFER_OPTIONS = --no-filtering --debug-exceptions --project-root $(SYM_ROOT) +INFER_OPTIONS = --no-capture --linters-only --no-filtering --debug-exceptions --project-root $(SYM_ROOT) INFERPRINT_OPTIONS = --issues-tests SOURCES = $(SYM_ROOT)/main.mm diff --git a/infer/tests/build_systems/make/Makefile b/infer/tests/build_systems/make/Makefile index 7ce3fe9d8..829abda98 100644 --- a/infer/tests/build_systems/make/Makefile +++ b/infer/tests/build_systems/make/Makefile @@ -5,8 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers - CLANG_OPTIONS = -c INFERPRINT_OPTIONS = --issues-tests @@ -16,6 +14,6 @@ include $(TESTS_DIR)/clang.make infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(HEADERS) $(QUIET)$(call silent_on_success,Testing make clang and javac integration,\ - $(INFER_BIN) --dump-duplicate-symbols --project-root $(TESTS_DIR) -a $(ANALYZER) -- \ + $(INFER_BIN) --dump-duplicate-symbols --project-root $(TESTS_DIR) -- \ make -C ../codetoanalyze/make clean all) $(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt) diff --git a/infer/tests/build_systems/mvn/Makefile b/infer/tests/build_systems/mvn/Makefile index aac7d51ba..9b79806fa 100644 --- a/infer/tests/build_systems/mvn/Makefile +++ b/infer/tests/build_systems/mvn/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../.. -ANALYZER = checkers INFERPRINT_OPTIONS = --issues-tests MVN_DIRS = app_with_submodules simple_app app_with_infer_profile app_with_profiles @@ -26,7 +25,7 @@ infer-out/report.json: infer-out-%/report.json: $(JAVA_DEPS) $(SOURCES) $(QUIET)cd ../codetoanalyze/mvn/$* && \ $(call silent_on_success,Testing mvn Java integration: $*,\ - $(INFER_BIN) -a $(ANALYZER) --results-dir $(CURDIR)/$(@D) \ + $(INFER_BIN) --results-dir $(CURDIR)/$(@D) \ --project-root $(CURDIR)/$(TESTS_DIR) -- \ $(MVN) clean compile) @@ -37,7 +36,7 @@ infer-out-simple_app/report.json: infer-out-app_with_infer_profile/report.json infer-out-app_with_infer_profile/report.json: infer-out-app_with_profiles/report.json issues-%.exp.test: infer-out-%/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@ \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@ \ -o $(> $@ diff --git a/infer/tests/codetoanalyze/java/eradicate/Makefile b/infer/tests/codetoanalyze/java/eradicate/Makefile index c0b81a5fb..927af418b 100644 --- a/infer/tests/codetoanalyze/java/eradicate/Makefile +++ b/infer/tests/codetoanalyze/java/eradicate/Makefile @@ -5,13 +5,12 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = \ --eradicate-only \ - --eradicate-return-over-annotated \ - --eradicate-optional-present \ - --eradicate-condition-redundant \ - --debug-exceptions + --eradicate-return-over-annotated \ + --eradicate-optional-present \ + --eradicate-condition-redundant \ + --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) $(wildcard $(TESTS_DIR)/external/library/*.java) diff --git a/infer/tests/codetoanalyze/java/hoisting/Makefile b/infer/tests/codetoanalyze/java/hoisting/Makefile index 1bd20565e..7c8504d02 100644 --- a/infer/tests/codetoanalyze/java/hoisting/Makefile +++ b/infer/tests/codetoanalyze/java/hoisting/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --loop-hoisting-only --invariant-by-default --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/infer/Makefile b/infer/tests/codetoanalyze/java/infer/Makefile index 8e8778bc1..7272b20fa 100644 --- a/infer/tests/codetoanalyze/java/infer/Makefile +++ b/infer/tests/codetoanalyze/java/infer/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --biabduction-only --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/lab/Makefile b/infer/tests/codetoanalyze/java/lab/Makefile index 38e9846e8..29c29b208 100644 --- a/infer/tests/codetoanalyze/java/lab/Makefile +++ b/infer/tests/codetoanalyze/java/lab/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --resource-leak-only --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/litho/Makefile b/infer/tests/codetoanalyze/java/litho/Makefile index 345852a08..f7ab46058 100644 --- a/infer/tests/codetoanalyze/java/litho/Makefile +++ b/infer/tests/codetoanalyze/java/litho/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --litho-only --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/performance/Makefile b/infer/tests/codetoanalyze/java/performance/Makefile index 91cdc2d33..4614085ef 100644 --- a/infer/tests/codetoanalyze/java/performance/Makefile +++ b/infer/tests/codetoanalyze/java/performance/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --cost-only --debug-exceptions --use-cost-threshold INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/quandary/Makefile b/infer/tests/codetoanalyze/java/quandary/Makefile index c2b655201..c39f57cb2 100644 --- a/infer/tests/codetoanalyze/java/quandary/Makefile +++ b/infer/tests/codetoanalyze/java/quandary/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --quandary-only --passthroughs --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/racerd/Makefile b/infer/tests/codetoanalyze/java/racerd/Makefile index 0d0dc30fc..55dad5564 100644 --- a/infer/tests/codetoanalyze/java/racerd/Makefile +++ b/infer/tests/codetoanalyze/java/racerd/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --racerd-only --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/stability/Makefile b/infer/tests/codetoanalyze/java/stability/Makefile index 0718cf561..5be3d474d 100644 --- a/infer/tests/codetoanalyze/java/stability/Makefile +++ b/infer/tests/codetoanalyze/java/stability/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --racerd-only --debug-exceptions --racerd-use-path-stability INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/starvation/Makefile b/infer/tests/codetoanalyze/java/starvation/Makefile index 1af86dea6..eb1621d0c 100644 --- a/infer/tests/codetoanalyze/java/starvation/Makefile +++ b/infer/tests/codetoanalyze/java/starvation/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --starvation-only --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/java/tracing/Makefile b/infer/tests/codetoanalyze/java/tracing/Makefile index df7c617ec..5caef8f19 100644 --- a/infer/tests/codetoanalyze/java/tracing/Makefile +++ b/infer/tests/codetoanalyze/java/tracing/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers INFER_OPTIONS = --biabduction-only --tracing --debug-exceptions INFERPRINT_OPTIONS = --issues-tests SOURCES = $(wildcard *.java) diff --git a/infer/tests/codetoanalyze/objc/errors/Makefile b/infer/tests/codetoanalyze/objc/errors/Makefile index c94b72bb6..ef2b5c672 100644 --- a/infer/tests/codetoanalyze/objc/errors/Makefile +++ b/infer/tests/codetoanalyze/objc/errors/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) CLEAN_EXTRA = infer-out-arc infer-out-all infer-out-all infer-out-arc \ @@ -125,27 +124,27 @@ $(OBJECTS_BASE) $(OBJECTS_BUCKETS_ALL): $(SOURCES_BASE) $(SOURCES_BUCKET_ALL) infer-out-all/report.json: $(CLANG_DEPS) $(SOURCES_BUCKET_ALL) $(QUIET)$(call silent_on_success,Testing infer/Objective-C with all memleak buckets,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) --ml-buckets all -o infer-out-all -- \ + $(INFER_BIN) $(INFER_OPTIONS) --ml-buckets all -o infer-out-all -- \ clang $(CLANG_OPTIONS) $(SOURCES_BUCKET_ALL)) $(QUIET)$(call check_no_duplicates,infer-out-all/duplicates.txt) infer-out-arc/report.json: $(CLANG_DEPS) $(SOURCES_ARC) $(QUIET)$(call silent_on_success,Testing infer/Objective-C with arc memleak buckets,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) --ml-buckets cf -o infer-out-arc -- \ + $(INFER_BIN) $(INFER_OPTIONS) --ml-buckets cf -o infer-out-arc -- \ clang $(CLANG_OPTIONS) -fobjc-arc $(SOURCES_ARC)) $(QUIET)$(call check_no_duplicates,infer-out-arc/duplicates.txt) infer-out/report.json: $(CLANG_DEPS) $(SOURCES_DEFAULT) $(QUIET)$(call silent_on_success,Testing infer/Objective-C with CF memleak buckets,\ - $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) --ml-buckets cf -o infer-out -- \ + $(INFER_BIN) $(INFER_OPTIONS) --ml-buckets cf -o infer-out -- \ clang $(CLANG_OPTIONS) $(SOURCES_DEFAULT)) $(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt) issues.exp.test: infer-out-all/report.json infer-out-arc/report.json infer-out/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.all \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.all \ -o infer-out-all --from-json-report infer-out-all/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.arc \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.arc \ -o infer-out-arc --from-json-report infer-out-arc/report.json - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) $(INFERPRINT_OPTIONS) $@.default \ + $(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.default \ -o infer-out --from-json-report infer-out/report.json $(QUIET)cat $@.all $@.arc $@.default > $@ diff --git a/infer/tests/codetoanalyze/objc/ioslints/Makefile b/infer/tests/codetoanalyze/objc/ioslints/Makefile index 9be39545c..077f70b16 100644 --- a/infer/tests/codetoanalyze/objc/ioslints/Makefile +++ b/infer/tests/codetoanalyze/objc/ioslints/Makefile @@ -7,8 +7,7 @@ TESTS_DIR = ../../.. CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) -fobjc-arc -ANALYZER = linters -INFER_OPTIONS = --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \ +INFER_OPTIONS = --no-capture --linters-only --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \ --iphoneos-target-sdk-version 8.0 \ --iphoneos-target-sdk-version-path-regex "codetoanalyze/objc/ioslints/filter_out_unavailable_api\.m:10.0" \ --iphoneos-target-sdk-version-path-regex "codetoanalyze/objc/ioslints/RemoveObserverInGivenSDKTest\.m:9.0" \ diff --git a/infer/tests/codetoanalyze/objc/linters-def-folder/Makefile b/infer/tests/codetoanalyze/objc/linters-def-folder/Makefile index a75becdc8..4412245d2 100644 --- a/infer/tests/codetoanalyze/objc/linters-def-folder/Makefile +++ b/infer/tests/codetoanalyze/objc/linters-def-folder/Makefile @@ -5,9 +5,8 @@ TESTS_DIR = ../../.. -ANALYZER = linters CLANG_OPTIONS = -c -fobjc-arc $(OBJC_CLANG_OPTIONS) -INFER_OPTIONS = --linters-def-folder checks --project-root $(TESTS_DIR) +INFER_OPTIONS = --no-capture --linters-only --linters-def-folder checks --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = file.m diff --git a/infer/tests/codetoanalyze/objc/linters-for-test-only/Makefile b/infer/tests/codetoanalyze/objc/linters-for-test-only/Makefile index 0614a2146..ef08ea9f6 100644 --- a/infer/tests/codetoanalyze/objc/linters-for-test-only/Makefile +++ b/infer/tests/codetoanalyze/objc/linters-for-test-only/Makefile @@ -5,9 +5,8 @@ TESTS_DIR = ../../.. -ANALYZER = linters CLANG_OPTIONS = -fobjc-arc -c $(IOS_CLANG_OPTIONS) -INFER_OPTIONS = --cxx --linters-def-file al_definitions/linters_example.al --project-root $(TESTS_DIR) +INFER_OPTIONS = --no-capture --linters-only --cxx --linters-def-file al_definitions/linters_example.al --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = \ diff --git a/infer/tests/codetoanalyze/objc/linters/Makefile b/infer/tests/codetoanalyze/objc/linters/Makefile index e2a0ac9a5..853f16516 100644 --- a/infer/tests/codetoanalyze/objc/linters/Makefile +++ b/infer/tests/codetoanalyze/objc/linters/Makefile @@ -5,10 +5,10 @@ TESTS_DIR = ../../.. -ANALYZER = linters CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) -fobjc-arc -INFER_OPTIONS = --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \ - --linters-doc-url "ASSIGN_POINTER_WARNING:www.example.com" +INFER_OPTIONS = \ + --no-capture --linters-only --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \ + --linters-doc-url "ASSIGN_POINTER_WARNING:www.example.com" INFERPRINT_OPTIONS = --issues-tests SOURCES = \ diff --git a/infer/tests/codetoanalyze/objc/liveness/Makefile b/infer/tests/codetoanalyze/objc/liveness/Makefile index 7902d11a8..cf2d6ef3a 100644 --- a/infer/tests/codetoanalyze/objc/liveness/Makefile +++ b/infer/tests/codetoanalyze/objc/liveness/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers CLANG_OPTIONS = -fobjc-arc -c $(OBJC_CLANG_OPTIONS) INFER_OPTIONS = --liveness-only --debug-exceptions --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/codetoanalyze/objc/nullable/Makefile b/infer/tests/codetoanalyze/objc/nullable/Makefile index e221f627e..247458cec 100644 --- a/infer/tests/codetoanalyze/objc/nullable/Makefile +++ b/infer/tests/codetoanalyze/objc/nullable/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) INFER_OPTIONS = --debug-exceptions --no-default-checkers --suggest-nullable --check-nullable --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/codetoanalyze/objc/quandary/Makefile b/infer/tests/codetoanalyze/objc/quandary/Makefile index e36cbe3ff..6cdac3ab8 100644 --- a/infer/tests/codetoanalyze/objc/quandary/Makefile +++ b/infer/tests/codetoanalyze/objc/quandary/Makefile @@ -7,8 +7,7 @@ TESTS_DIR = ../../.. CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) -ANALYZER = quandary -INFER_OPTIONS = --no-filtering --debug-exceptions --project-root $(TESTS_DIR) --iphoneos-target-sdk-version 8.0 +INFER_OPTIONS = --quandary-only --no-filtering --debug-exceptions --project-root $(TESTS_DIR) --iphoneos-target-sdk-version 8.0 INFERPRINT_OPTIONS = --issues-tests SOURCES = \ diff --git a/infer/tests/codetoanalyze/objc/uninit/Makefile b/infer/tests/codetoanalyze/objc/uninit/Makefile index 3096460e3..b7111df27 100644 --- a/infer/tests/codetoanalyze/objc/uninit/Makefile +++ b/infer/tests/codetoanalyze/objc/uninit/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers # see explanations in cpp/errors/Makefile for the custom isystem CLANG_OPTIONS = -c $(OBJC_CLANG_OPTIONS) INFER_OPTIONS = --uninit-only --debug-exceptions --project-root $(TESTS_DIR) diff --git a/infer/tests/codetoanalyze/objcpp/errors/Makefile b/infer/tests/codetoanalyze/objcpp/errors/Makefile index 363beece7..d23f1f8cb 100644 --- a/infer/tests/codetoanalyze/objcpp/errors/Makefile +++ b/infer/tests/codetoanalyze/objcpp/errors/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers CLANG_OPTIONS = -c $(OBJCPP_CLANG_OPTIONS) -fobjc-arc INFER_OPTIONS = --biabduction-only --no-filtering --debug-exceptions --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/codetoanalyze/objcpp/linters-for-test-only/Makefile b/infer/tests/codetoanalyze/objcpp/linters-for-test-only/Makefile index 3a0091daf..b0fdfe49f 100644 --- a/infer/tests/codetoanalyze/objcpp/linters-for-test-only/Makefile +++ b/infer/tests/codetoanalyze/objcpp/linters-for-test-only/Makefile @@ -5,16 +5,15 @@ TESTS_DIR = ../../.. -ANALYZER = linters CLANG_OPTIONS = -fobjc-arc -c $(OBJCPP_CLANG_OPTIONS) -INFER_OPTIONS = --cxx --linters-def-file linters_example.al --project-root $(TESTS_DIR) +INFER_OPTIONS = --no-capture --linters-only --cxx --linters-def-file linters_example.al --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests SOURCES = \ $(wildcard *.m) \ $(wildcard */*.m) \ - $(wildcard *.mm) \ - $(wildcard *.c) \ + $(wildcard *.mm) \ + $(wildcard *.c) \ include $(TESTS_DIR)/clang.make include $(TESTS_DIR)/objc.make diff --git a/infer/tests/codetoanalyze/objcpp/linters/Makefile b/infer/tests/codetoanalyze/objcpp/linters/Makefile index 03a4cd434..84a7ddc55 100644 --- a/infer/tests/codetoanalyze/objcpp/linters/Makefile +++ b/infer/tests/codetoanalyze/objcpp/linters/Makefile @@ -5,10 +5,10 @@ TESTS_DIR = ../../.. -ANALYZER = linters CLANG_OPTIONS = -c -fobjc-arc $(OBJCPP_CLANG_OPTIONS) -INFER_OPTIONS = --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \ - --enable-issue-type GLOBAL_VARIABLE_INITIALIZED_WITH_FUNCTION_OR_METHOD_CALL +INFER_OPTIONS = \ + --no-capture --linters-only --no-filtering --debug-exceptions --project-root $(TESTS_DIR) \ + --enable-issue-type GLOBAL_VARIABLE_INITIALIZED_WITH_FUNCTION_OR_METHOD_CALL INFERPRINT_OPTIONS = --issues-tests SOURCES = \ diff --git a/infer/tests/codetoanalyze/objcpp/liveness/Makefile b/infer/tests/codetoanalyze/objcpp/liveness/Makefile index 535e90a20..0fc6a6e60 100644 --- a/infer/tests/codetoanalyze/objcpp/liveness/Makefile +++ b/infer/tests/codetoanalyze/objcpp/liveness/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers CLANG_OPTIONS = -fobjc-arc -c $(OBJCPP_CLANG_OPTIONS) INFER_OPTIONS = --liveness-only --debug-exceptions --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/codetoanalyze/objcpp/nullable/Makefile b/infer/tests/codetoanalyze/objcpp/nullable/Makefile index f826e2828..7f7dd5ac2 100644 --- a/infer/tests/codetoanalyze/objcpp/nullable/Makefile +++ b/infer/tests/codetoanalyze/objcpp/nullable/Makefile @@ -5,7 +5,6 @@ TESTS_DIR = ../../.. -ANALYZER = checkers CLANG_OPTIONS = -c $(OBJCPP_CLANG_OPTIONS) INFER_OPTIONS = --debug-exceptions --no-default-checkers --suggest-nullable --check-nullable --project-root $(TESTS_DIR) INFERPRINT_OPTIONS = --issues-tests diff --git a/infer/tests/infer.make b/infer/tests/infer.make index 2e2f24f37..7f7ecfd88 100644 --- a/infer/tests/infer.make +++ b/infer/tests/infer.make @@ -7,13 +7,10 @@ INFER_OUT ?= infer-out$(TEST_SUFFIX) include $(TESTS_DIR)/base.make -# useful to print non-default analyzer -ANALYZER_STRING=$(shell if [ -n $(ANALYZER) ]; then printf ' ($(ANALYZER))'; fi) - default: compile issues.exp.test$(TEST_SUFFIX): $(INFER_OUT)/report.json $(INFER_BIN) - $(QUIET)$(INFER_BIN) report -q -a $(ANALYZER) --results-dir $(