[config] sensible default for --from-json-report

Summary:
Make <infer-out>/report.json the default value for this option, as this
is what is used 99% of the time. Clean up test options using this.

Reviewed By: ngorogiannis

Differential Revision: D20362644

fbshipit-source-id: a1bb18757

infer/man/man1/infer-full.txt

@@ -655,16 +655,16 @@ OPTIONS
            particular path, with the format path:version (can be specified
            multiple times)           See also infer-capture(1).
 
-       --issues-fields ,-separated sequence of { bug_type | bucket |
+       --issues-tests file
+           Write a list of issues in a format suitable for tests to file       
+    See also infer-report(1).
+
+       --issues-tests-fields ,-separated sequence of { bug_type | bucket |
        qualifier | severity | line | column | procedure |
        procedure_start_line | file | bug_trace | key | hash | line_offset |
        qualifier_contains_potential_exception_note }
            Fields to emit with --issues-tests           See also infer-report(1).
 
-       --issues-tests file
-           Write a list of issues in a format suitable for tests to file       
-    See also infer-report(1).
-
        --java-jar-compiler path
            Specify the Java compiler jar used to generate the bytecode       
     See also infer-capture(1).

infer/man/man1/infer-report.txt

@@ -274,15 +274,15 @@ OPTIONS
            Show this manual with all internal options in the INTERNAL OPTIONS
            section
 
-       --issues-fields ,-separated sequence of { bug_type | bucket |
+       --issues-tests file
+           Write a list of issues in a format suitable for tests to file
+
+       --issues-tests-fields ,-separated sequence of { bug_type | bucket |
        qualifier | severity | line | column | procedure |
        procedure_start_line | file | bug_trace | key | hash | line_offset |
        qualifier_contains_potential_exception_note }
            Fields to emit with --issues-tests
 
-       --issues-tests file
-           Write a list of issues in a format suitable for tests to file
-
        --print-logs
            Activates: Also log messages to stdout and stderr (Conversely:
            --no-print-logs)

infer/man/man1/infer.txt

@@ -655,16 +655,16 @@ OPTIONS
            particular path, with the format path:version (can be specified
            multiple times)           See also infer-capture(1).
 
-       --issues-fields ,-separated sequence of { bug_type | bucket |
+       --issues-tests file
+           Write a list of issues in a format suitable for tests to file       
+    See also infer-report(1).
+
+       --issues-tests-fields ,-separated sequence of { bug_type | bucket |
        qualifier | severity | line | column | procedure |
        procedure_start_line | file | bug_trace | key | hash | line_offset |
        qualifier_contains_potential_exception_note }
            Fields to emit with --issues-tests           See also infer-report(1).
 
-       --issues-tests file
-           Write a list of issues in a format suitable for tests to file       
-    See also infer-report(1).
-
        --java-jar-compiler path
            Specify the Java compiler jar used to generate the bytecode       
     See also infer-capture(1).

infer/src/backend/InferPrint.ml

@@ -444,7 +444,7 @@ let pp_json_report_by_report_kind formats_by_report_kind fname =
           match format_kind with
           | Tests ->
               let outf = get_outfile outfile_opt in
-              pp_custom_of_report outf.fmt report Config.issues_fields
+              pp_custom_of_report outf.fmt report Config.issues_tests_fields
           | Json ->
               L.die InternalError "Printing issues from json does not support json output"
         in
@@ -578,9 +578,9 @@ let main ~report_json =
     costs_report_format_kind @ [(Issues, issue_formats); (Summary, [])]
   in
   init_files formats_by_report_kind ;
-  ( match Config.from_json_report with
+  ( match Config.issues_tests with
-  | Some fname ->
+  | Some _ ->
-      pp_json_report_by_report_kind formats_by_report_kind fname
+      pp_json_report_by_report_kind formats_by_report_kind Config.from_json_report
   | None ->
       pp_summary_and_issues formats_by_report_kind issue_formats ) ;
   if Config.test_determinator && Config.process_clang_ast then

infer/src/base/Config.ml

@@ -30,7 +30,7 @@ let ml_bucket_symbols =
   ; ("unknown_origin", `MLeak_unknown) ]
 
 
-let issues_fields_symbols =
+let issues_tests_fields_symbols =
   [ ("bug_type", `Issue_field_bug_type)
   ; ("bucket", `Issue_field_bucket)
   ; ("qualifier", `Issue_field_qualifier)
@@ -1434,8 +1434,8 @@ and iphoneos_target_sdk_version_path_regex =
      format path:version (can be specified multiple times)"
 
 
-and issues_fields =
+and issues_tests_fields =
-  CLOpt.mk_symbol_seq ~long:"issues-fields"
+  CLOpt.mk_symbol_seq ~long:"issues-tests-fields"
     ~in_help:InferCommand.[(Report, manual_generic)]
     ~default:
       [ `Issue_field_file
@@ -1445,7 +1445,7 @@ and issues_fields =
       ; `Issue_field_bucket
       ; `Issue_field_severity
       ; `Issue_field_bug_trace ]
-    ~symbols:issues_fields_symbols ~eq:PolyVariantEqual.( = )
+    ~symbols:issues_tests_fields_symbols ~eq:PolyVariantEqual.( = )
     "Fields to emit with $(b,--issues-tests)"
 
 
@@ -2757,7 +2757,7 @@ and force_delete_results_dir = !force_delete_results_dir
 
 and force_integration = !force_integration
 
-and from_json_report = !from_json_report
+and from_json_report = Option.value !from_json_report ~default:(!results_dir ^/ report_json)
 
 and frontend_stats = !frontend_stats
 
@@ -2783,10 +2783,10 @@ and iphoneos_target_sdk_version_path_regex =
   process_iphoneos_target_sdk_version_path_regex !iphoneos_target_sdk_version_path_regex
 
 
-and issues_fields = !issues_fields
-
 and issues_tests = !issues_tests
 
+and issues_tests_fields = !issues_tests_fields
+
 and iterations = !iterations
 
 and java_jar_compiler = !java_jar_compiler

infer/src/base/Config.mli

@@ -349,7 +349,7 @@ val force_delete_results_dir : bool
 
 val force_integration : build_system option
 
-val from_json_report : string option
+val from_json_report : string
 
 val frontend_stats : bool
 
@@ -385,7 +385,9 @@ val iphoneos_target_sdk_version_path_regex : iphoneos_target_sdk_version_path_re
 
 val is_checker_enabled : Checker.t -> bool
 
-val issues_fields :
+val issues_tests : string option
+
+val issues_tests_fields :
   [ `Issue_field_bug_type
   | `Issue_field_qualifier
   | `Issue_field_severity
@@ -402,8 +404,6 @@ val issues_fields :
   | `Issue_field_qualifier_contains_potential_exception_note ]
   list
 
-val issues_tests : string option
-
 val iterations : int
 
 val java_jar_compiler : string option

infer/tests/build_systems/buck_flavors_diff/Makefile

@@ -28,12 +28,10 @@ replace_reports: current.exp.test previous.exp.test
 
 current.exp.test: $(CURRENT_REPORT)
 	$(QUIET)$(INFER_BIN) report -o $(<D) \
-		--from-json-report $(CURRENT_DIR)/report.json \
 		--issues-tests current.exp.test
 
 previous.exp.test: $(PREVIOUS_REPORT)
 	$(QUIET)$(INFER_BIN) report -o $(<D) \
-		--from-json-report $(PREVIOUS_DIR)/report.json \
 		--issues-tests previous.exp.test
 
 test: compare_reports

infer/tests/build_systems/clang_compilation_db/Makefile

@@ -43,9 +43,9 @@ infer-out-reactive-capture/report.json: $(CMAKE_BUILD_DIR)/compile_commands.json
 
 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 $(INFERPRINT_OPTIONS) $@.with-index \
-	  -o infer-out-with-index --from-json-report infer-out-with-index/report.json
+	  -o infer-out-with-index
 	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.no-index \
-	  -o infer-out-no-index --from-json-report infer-out-no-index/report.json
+	  -o infer-out-no-index
 	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.reactive-capture \
-	  -o infer-out-reactive-capture --from-json-report infer-out-reactive-capture/report.json
+	  -o infer-out-reactive-capture
 	$(QUIET)cat $@.with-index $@.no-index $@.reactive-capture > $@

infer/tests/build_systems/differential_interesting_paths_filter/Makefile

@@ -34,14 +34,12 @@ $(MODIFIED_FILES_FILE):
 
 current.exp.test: $(CURRENT_REPORT)
 	$(QUIET)$(INFER_BIN) report -o $(<D) \
-		--issues-fields $(INFERPRINT_ISSUES_FIELDS) \
+		--issues-tests-fields $(INFERPRINT_ISSUES_FIELDS) \
-		--from-json-report $(CURRENT_DIR)/report.json \
 		--issues-tests current.exp.test
 
 previous.exp.test: $(PREVIOUS_REPORT)
 	$(QUIET)$(INFER_BIN) report -o $(<D) \
-		--issues-fields $(INFERPRINT_ISSUES_FIELDS) \
+		--issues-tests-fields $(INFERPRINT_ISSUES_FIELDS) \
-		--from-json-report $(PREVIOUS_DIR)/report.json \
 		--issues-tests previous.exp.test
 
 test: compare_reports

infer/tests/build_systems/mvn/Makefile

@@ -36,8 +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 $(INFERPRINT_OPTIONS) $@ \
+	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@ -o $(<D)
-	  -o $(<D) --from-json-report $<
 
 issues.exp.test: $(foreach mvndir,$(MVN_DIRS),issues-$(mvndir).exp.test)
 #	erase the contents of the file

infer/tests/build_systems/resource_leak_exception_lines/Makefile

@@ -21,8 +21,7 @@ $(REPORT): $(JAVA_DEPS) $(MAKEFILE_LIST) SimpleLeak.java
 
 $(EXPECTED_TEST_OUTPUT): $(REPORT)
 	$(QUIET)$(INFER_BIN) report -o $(<D) \
-		--issues-fields "qualifier_contains_potential_exception_note,bug_type,bucket,file,procedure,line_offset" \
+		--issues-tests-fields "qualifier_contains_potential_exception_note,bug_type,bucket,file,procedure,line_offset" \
-		--from-json-report $(REPORT) \
 		--issues-tests $(EXPECTED_TEST_OUTPUT)
 
 .PHONY: print

infer/tests/build_systems/utf8_in_pwd/Makefile

@@ -95,8 +95,7 @@ infer-out-make/report.json: $(CLANG_DEPS) $(MAKE_DIR)
 	  $(TESTLOCK) sh -c "$(MAKE) clean && $(INFER_BIN) --results-dir $(CURDIR)/$(@D) -- $(MAKE) all")
 
 issues-%.exp.test: infer-out-%/report.json $(INFER_BIN)
-	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@ \
+	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@ -o $(<D)
-	  -o $(<D) --from-json-report $<
 
 issues.exp.test: issues-cmake.exp.test issues-gradle.exp.test issues-javac.exp.test \
                  issues-make.exp.test

infer/tests/codetoanalyze/c/errors/Makefile

@@ -12,7 +12,7 @@ INFER_OPTIONS = \
 
 # we need to disable traces in C tests because assertions/assertion_failure.c has different traces
 # on Linux and OSX because of different implementations of assert() on each platform
-INFERPRINT_OPTIONS = --issues-fields "file,procedure,line_offset,bug_type,bucket" --issues-tests
+INFERPRINT_OPTIONS = --issues-tests-fields "file,procedure,line_offset,bug_type,bucket" --issues-tests
 
 SOURCES = \
   $(wildcard */*.c) \

infer/tests/codetoanalyze/java/classloads/Makefile

@@ -36,7 +36,7 @@ PROJECT_ROOT ?= $(TESTS_DIR)
 
 issues.exp.test$(TEST_SUFFIX): $(INFER_OUT)/report.json $(INFER_BIN)
 	$(QUIET)$(INFER_BIN) report -q --results-dir $(<D) \
-	   $(INFERPRINT_OPTIONS) $@ --from-json-report $<
+	   $(INFERPRINT_OPTIONS) $@
 
 infer-out/report.json: $(JAVA_DEPS) $(SOURCES) $(MAKEFILE_LIST)
 	$(QUIET)$(call silent_on_success,Testing infer/java in $(TEST_REL_DIR),\

infer/tests/codetoanalyze/objc/errors/Makefile

@@ -141,10 +141,10 @@ infer-out/report.json: $(CLANG_DEPS) $(SOURCES_DEFAULT)
 
 issues.exp.test: infer-out-all/report.json infer-out-arc/report.json infer-out/report.json
 	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.all \
-	  -o infer-out-all --from-json-report infer-out-all/report.json
+	  -o infer-out-all
 	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.arc \
-	  -o infer-out-arc --from-json-report infer-out-arc/report.json
+	  -o infer-out-arc
 	$(QUIET)$(INFER_BIN) report -q $(INFERPRINT_OPTIONS) $@.default \
-	  -o infer-out --from-json-report infer-out/report.json
+	  -o infer-out
 	$(QUIET)cat $@.all $@.arc $@.default > $@
 	$(QUIET)cat infer-out-all/duplicates.txt infer-out-arc/duplicates.txt >> infer-out/duplicates.txt

infer/tests/differential.make

@@ -40,15 +40,15 @@ $(EXPECTED_TEST_OUTPUT): $(CURRENT_REPORT) $(PREVIOUS_REPORT) $(MODIFIED_FILES_F
 		--costs-current $(CURRENT_COSTS) --costs-previous $(PREVIOUS_COSTS) \
 		$(DIFFERENTIAL_ARGS))
 	$(QUIET)$(INFER_BIN) report -o $(INFER_OUT) \
-		--issues-fields $(INFERPRINT_ISSUES_FIELDS) \
+		--issues-tests-fields $(INFERPRINT_ISSUES_FIELDS) \
 		--from-json-report $(INFER_OUT)/differential/introduced.json \
 		--issues-tests introduced.exp.test
 	$(QUIET)$(INFER_BIN) report -o $(INFER_OUT) \
-		--issues-fields $(INFERPRINT_ISSUES_FIELDS) \
+		--issues-tests-fields $(INFERPRINT_ISSUES_FIELDS) \
 		--from-json-report $(INFER_OUT)/differential/fixed.json \
 		--issues-tests fixed.exp.test
 	$(QUIET)$(INFER_BIN) report -o $(INFER_OUT) \
-		--issues-fields $(INFERPRINT_ISSUES_FIELDS) \
+		--issues-tests-fields $(INFERPRINT_ISSUES_FIELDS) \
 		--from-json-report $(INFER_OUT)/differential/preexisting.json \
 		--issues-tests preexisting.exp.test
 	$(QUIET)$(COPY) $(INFER_OUT)/differential/costs_summary.json \

infer/tests/infer.make

@@ -11,7 +11,7 @@ default: compile
 
 issues.exp.test$(TEST_SUFFIX): $(INFER_OUT)/report.json $(INFER_BIN)
 	$(QUIET)$(INFER_BIN) report -q --results-dir $(<D) \
-	   $(INFERPRINT_OPTIONS) $@ --from-json-report $<
+	   $(INFERPRINT_OPTIONS) $@
 
 .PHONY: compile
 compile: $(OBJECTS)