From 34d10fdede0aa3434549a6df596c33b35bf56e81 Mon Sep 17 00:00:00 2001 From: Jeremy Dubreil Date: Wed, 2 Aug 2017 21:50:52 -0700 Subject: [PATCH] [infer][cleanup] remove some left-over use of the Eradicate analyzer entry Reviewed By: mbouaziz Differential Revision: D5552083 fbshipit-source-id: 7b0d2db --- DEFS | 2 +- infer/lib/python/inferlib/config.py | 2 -- infer/src/backend/inferconfig.ml | 4 ++-- infer/src/base/Config.ml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DEFS b/DEFS index dac31f22f..759818aad 100644 --- a/DEFS +++ b/DEFS @@ -1,6 +1,6 @@ import os -analyzers = ['infer', 'eradicate'] +analyzers = ['infer', 'checkers'] original_java_library = java_library def java_library( diff --git a/infer/lib/python/inferlib/config.py b/infer/lib/python/inferlib/config.py index 6977de1b7..897a2ca1c 100644 --- a/infer/lib/python/inferlib/config.py +++ b/infer/lib/python/inferlib/config.py @@ -62,7 +62,6 @@ BUCK_OUT_GEN = os.path.join(BUCK_OUT, 'gen') # list of possible analyzers ANALYZER_INFER = 'infer' -ANALYZER_ERADICATE = 'eradicate' ANALYZER_CHECKERS = 'checkers' ANALYZER_CAPTURE = 'capture' ANALYZER_COMPILE = 'compile' @@ -74,7 +73,6 @@ ANALYZERS = [ ANALYZER_CHECKERS, ANALYZER_COMPILE, ANALYZER_CRASHCONTEXT, - ANALYZER_ERADICATE, ANALYZER_INFER, ANALYZER_LINTERS, ] diff --git a/infer/src/backend/inferconfig.ml b/infer/src/backend/inferconfig.ml index 1b2c26da5..c7d4c8e8b 100644 --- a/infer/src/backend/inferconfig.ml +++ b/infer/src/backend/inferconfig.ml @@ -343,8 +343,8 @@ let is_checker_enabled checker_name = && not (List.mem ~equal:String.( = ) Config.checks_disabled_by_default checker_name) (* This function loads and list the path that are being filtered by the analyzer. The results *) -(* are of the form: path/to/file.java -> {infer, eradicate} meaning that analysis results will *) -(* be reported on path/to/file.java both for infer and for eradicate *) +(* are of the form: path/to/file.java -> {infer, checkers} meaning that analysis results will *) +(* be reported on path/to/file.java both for infer and for the checkers *) let test () = let filters = List.map diff --git a/infer/src/base/Config.ml b/infer/src/base/Config.ml index 421ff1de0..2cee5249e 100644 --- a/infer/src/base/Config.ml +++ b/infer/src/base/Config.ml @@ -566,7 +566,7 @@ and analyzer = ~in_help:CLOpt.([(Analyze, manual_generic); (Run, manual_generic)]) {|Specify which analyzer to run (only one at a time is supported): - $(b,infer): run the bi-abduction based checker, in particular to check for memory errors (activated by default) -- $(b,checkers), $(b,eradicate): run the specified analysis +- $(b,checkers): run the checkers - $(b,capture): similar to specifying the $(b,capture) subcommand (DEPRECATED) - $(b,compile): similar to specifying the $(b,compile) subcommand (DEPRECATED) - $(b,crashcontext): experimental (see $(b,--crashcontext))