From 6b0abe3b577a1ca0e5570430179c8ae05b4b76e2 Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Wed, 2 Nov 2016 16:51:33 -0700
Subject: [PATCH] [config] Do not pass options to clusters via INFER_OPTIONS

Summary:
Child processes invoked in multicore mode get arguments using the usual
INFER_ARGS mechanism already, no need for a special case.

Reviewed By: jvillard

Differential Revision: D4110728

fbshipit-source-id: 0987216
---
 infer/lib/python/inferlib/analyze.py | 9 +--------
 infer/src/backend/clusterMakefile.ml | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/infer/lib/python/inferlib/analyze.py b/infer/lib/python/inferlib/analyze.py
index a2d349704..f43ad42e1 100644
--- a/infer/lib/python/inferlib/analyze.py
+++ b/infer/lib/python/inferlib/analyze.py
@@ -203,20 +203,14 @@ class AnalyzerWrapper(object):
             '-results_dir',
             self.args.infer_out
         ]
-        infer_options = []
-
         exit_status = os.EX_OK
 
-        infer_options = map(utils.decode_or_not, infer_options)
-        infer_options_str = ' '.join(infer_options)
-        os.environ['INFER_OPTIONS'] = utils.encode(infer_options_str)
-
         javac_original_arguments = \
             self.javac.original_arguments if self.javac is not None else []
 
         if self.args.multicore == 1:
             analysis_start_time = time.time()
-            analyze_cmd = infer_analyze + infer_options
+            analyze_cmd = infer_analyze
             exit_status = run_command(
                 analyze_cmd,
                 self.args.debug,
@@ -236,7 +230,6 @@ class AnalyzerWrapper(object):
             os.mkdir(multicore_dir)
             os.chdir(multicore_dir)
             analyze_cmd = infer_analyze + ['-makefile', 'Makefile']
-            analyze_cmd += infer_options
             makefile_generation_start_time = time.time()
             makefile_status = run_command(
                 analyze_cmd,
diff --git a/infer/src/backend/clusterMakefile.ml b/infer/src/backend/clusterMakefile.ml
index 65ebe89de..c8952bfda 100644
--- a/infer/src/backend/clusterMakefile.ml
+++ b/infer/src/backend/clusterMakefile.ml
@@ -49,7 +49,7 @@ let cluster_should_be_analyzed cluster =
 
 
 let pp_prolog fmt clusters =
-  F.fprintf fmt "INFERANALYZE= %s $(INFER_OPTIONS) -results_dir '%s'\n@."
+  F.fprintf fmt "INFERANALYZE= %s -results_dir '%s'\n@."
     Sys.executable_name
     (Escape.escape_map
        (fun c -> if c = '#' then Some "\\#" else None)
@@ -64,7 +64,7 @@ let pp_prolog fmt clusters =
 
   F.fprintf fmt "@.@.default: test@.@.all: test@.@.";
   F.fprintf fmt "test: $(CLUSTERS)@.";
-  if Config.show_progress_bar then F.fprintf fmt "\techo \"\"@."
+  if Config.show_progress_bar then F.fprintf fmt "\t@@echo@\n@."
 
 let pp_epilog fmt () =
   F.fprintf fmt "@.clean:@.\trm -f $(CLUSTERS)@."