Summary: At this point in the stack, here's what's left in InferPrint.ml: 1. how to output report.json and costs_report.json 2. how to print summaries from the command line (`infer report`) 3. how to print --issues-tests stuff (`infer report --issues-tests`) Keep only 1. in there. 2. goes to SpecsFiles.ml directly from infer.ml, and 3. goes to its own module (also the fields to output in --issues-tests get a non-poly variant). 1. does some extra stuff sometimes, eg in test-determinator mode. Keep this for now. Reviewed By: ngorogiannis Differential Revision: D20362642 fbshipit-source-id: 0d9f0e8e2master
Jules Villard
5 years ago
committed by
Facebook GitHub Bot
parent
339ebe74ec
commit
19e8ae652c
@ -0,0 +1,41 @@
|
|||||||
|
(*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*)
|
||||||
|
|
||||||
|
open! IStd
|
||||||
|
|
||||||
|
type t =
|
||||||
|
| BugType
|
||||||
|
| Qualifier
|
||||||
|
| Severity
|
||||||
|
| Bucket
|
||||||
|
| Line
|
||||||
|
| Column
|
||||||
|
| Procedure
|
||||||
|
| ProcedureStartLine
|
||||||
|
| File
|
||||||
|
| BugTrace
|
||||||
|
| Key
|
||||||
|
| Hash
|
||||||
|
| LineOffset
|
||||||
|
| QualifierContainsPotentialExceptionNote
|
||||||
|
[@@deriving equal]
|
||||||
|
|
||||||
|
let all_symbols =
|
||||||
|
[ ("bug_type", BugType)
|
||||||
|
; ("bucket", Bucket)
|
||||||
|
; ("qualifier", Qualifier)
|
||||||
|
; ("severity", Severity)
|
||||||
|
; ("line", Line)
|
||||||
|
; ("column", Column)
|
||||||
|
; ("procedure", Procedure)
|
||||||
|
; ("procedure_start_line", ProcedureStartLine)
|
||||||
|
; ("file", File)
|
||||||
|
; ("bug_trace", BugTrace)
|
||||||
|
; ("key", Key)
|
||||||
|
; ("hash", Hash)
|
||||||
|
; ("line_offset", LineOffset)
|
||||||
|
; ("qualifier_contains_potential_exception_note", QualifierContainsPotentialExceptionNote) ]
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
(*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*)
|
||||||
|
|
||||||
|
open! IStd
|
||||||
|
|
||||||
|
type t =
|
||||||
|
| BugType
|
||||||
|
| Qualifier
|
||||||
|
| Severity
|
||||||
|
| Bucket
|
||||||
|
| Line
|
||||||
|
| Column
|
||||||
|
| Procedure
|
||||||
|
| ProcedureStartLine
|
||||||
|
| File
|
||||||
|
| BugTrace
|
||||||
|
| Key
|
||||||
|
| Hash
|
||||||
|
| LineOffset
|
||||||
|
| QualifierContainsPotentialExceptionNote
|
||||||
|
[@@deriving equal]
|
||||||
|
|
||||||
|
val all_symbols : (string * t) list
|
||||||
@ -0,0 +1,81 @@
|
|||||||
|
(*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*)
|
||||||
|
|
||||||
|
open! IStd
|
||||||
|
module F = Format
|
||||||
|
|
||||||
|
let pp_custom_of_report fmt report fields =
|
||||||
|
let pp_custom_of_issue fmt (issue : Jsonbug_t.jsonbug) =
|
||||||
|
let open Jsonbug_t in
|
||||||
|
let comma_separator index = if index > 0 then ", " else "" in
|
||||||
|
let pp_trace fmt trace comma =
|
||||||
|
let pp_trace_elem fmt {description} = F.pp_print_string fmt description in
|
||||||
|
let trace_without_empty_descs =
|
||||||
|
List.filter ~f:(fun {description} -> not (String.is_empty description)) trace
|
||||||
|
in
|
||||||
|
F.fprintf fmt "%s[%a]" comma (Pp.comma_seq pp_trace_elem) trace_without_empty_descs
|
||||||
|
in
|
||||||
|
let pp_field index field =
|
||||||
|
match (field : IssuesTestField.t) with
|
||||||
|
| BugType ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) issue.bug_type
|
||||||
|
| Bucket ->
|
||||||
|
let bucket =
|
||||||
|
match
|
||||||
|
String.lsplit2 issue.qualifier ~on:']'
|
||||||
|
|> Option.map ~f:fst
|
||||||
|
|> Option.bind ~f:(String.chop_prefix ~prefix:"[")
|
||||||
|
with
|
||||||
|
| Some bucket ->
|
||||||
|
bucket
|
||||||
|
| None ->
|
||||||
|
"no_bucket"
|
||||||
|
in
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) bucket
|
||||||
|
| Qualifier ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) issue.qualifier
|
||||||
|
| Severity ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) issue.severity
|
||||||
|
| Line ->
|
||||||
|
F.fprintf fmt "%s%d" (comma_separator index) issue.line
|
||||||
|
| Column ->
|
||||||
|
F.fprintf fmt "%s%d" (comma_separator index) issue.column
|
||||||
|
| Procedure ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) issue.procedure
|
||||||
|
| ProcedureStartLine ->
|
||||||
|
F.fprintf fmt "%s%d" (comma_separator index) issue.procedure_start_line
|
||||||
|
| File ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) issue.file
|
||||||
|
| BugTrace ->
|
||||||
|
pp_trace fmt issue.bug_trace (comma_separator index)
|
||||||
|
| Key ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) (Caml.Digest.to_hex issue.key)
|
||||||
|
| Hash ->
|
||||||
|
F.fprintf fmt "%s%s" (comma_separator index) (Caml.Digest.to_hex issue.hash)
|
||||||
|
| LineOffset ->
|
||||||
|
F.fprintf fmt "%s%d" (comma_separator index) (issue.line - issue.procedure_start_line)
|
||||||
|
| QualifierContainsPotentialExceptionNote ->
|
||||||
|
F.pp_print_bool fmt
|
||||||
|
(String.is_substring issue.qualifier ~substring:InferPrint.potential_exception_message)
|
||||||
|
in
|
||||||
|
List.iteri ~f:pp_field fields ; F.fprintf fmt "@."
|
||||||
|
in
|
||||||
|
List.iter ~f:(pp_custom_of_issue fmt) report
|
||||||
|
|
||||||
|
|
||||||
|
let tests_jsonbug_compare (bug1 : Jsonbug_t.jsonbug) (bug2 : Jsonbug_t.jsonbug) =
|
||||||
|
let open Jsonbug_t in
|
||||||
|
[%compare: string * string * int * string * Caml.Digest.t]
|
||||||
|
(bug1.file, bug1.procedure, bug1.line - bug1.procedure_start_line, bug1.bug_type, bug1.hash)
|
||||||
|
(bug2.file, bug2.procedure, bug2.line - bug2.procedure_start_line, bug2.bug_type, bug2.hash)
|
||||||
|
|
||||||
|
|
||||||
|
let write_from_json ~json_path ~out_path issues_tests_fields =
|
||||||
|
Utils.with_file_out out_path ~f:(fun outf ->
|
||||||
|
let report = Atdgen_runtime.Util.Json.from_file Jsonbug_j.read_report json_path in
|
||||||
|
let sorted_report = List.sort ~compare:tests_jsonbug_compare report in
|
||||||
|
pp_custom_of_report (F.formatter_of_out_channel outf) sorted_report issues_tests_fields )
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
(*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*)
|
||||||
|
|
||||||
|
open! IStd
|
||||||
|
|
||||||
|
val write_from_json : json_path:string -> out_path:string -> IssuesTestField.t list -> unit
|
||||||
Loading…
Reference in new issue