commit 533657e0b13320312268d3d4d23ae6507304a317
author Janak Ramakrishnan <janakr@google.com> Fri Nov 13 23:34:14 2015 +0000
committer Damien Martin-Guillerez <dmarting@google.com> Mon Nov 16 09:02:33 2015 +0000
tree 8a3fbe3e60cc8655f816695e8ecae04413734537
parent b503be7b2e2e6a1601bff3790e6e292ff9076359

Optionally allow Bazel to pass JVM options containing spaces directly through to the JVM instead of (almost certainly incorrectly) splitting the options along spaces.

This allows us to pass non-quote-delimited strings to the JVM, which is necessary for things like -XX:OnOutOfMemoryError="kill -3 %p" (normally bash strips those quotes, but they're not stripped when passed via --host_jvm_args).

--
MOS_MIGRATED_REVID=107820087

src/main/cpp/blaze_startup_options_common.cc

diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 914f7ab..8a5f6f1 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -41,6 +41,8 @@
   block_for_lock = true;
   host_jvm_debug = false;
   host_javabase = "";
+  // TODO(janakr): change this to true when ready, then delete it.
+  preserve_spaces_in_host_jvm_args = false;
   batch = false;
   batch_cpu_scheduling = false;
   blaze_cpu = false;
@@ -73,6 +75,7 @@
   lhs->host_jvm_debug = rhs.host_jvm_debug;
   lhs->host_jvm_profile = rhs.host_jvm_profile;
   lhs->host_javabase = rhs.host_javabase;
+  lhs->preserve_spaces_in_host_jvm_args = rhs.preserve_spaces_in_host_jvm_args;
   lhs->host_jvm_args = rhs.host_jvm_args;
   lhs->batch = rhs.batch;
   lhs->batch_cpu_scheduling = rhs.batch_cpu_scheduling;
@@ -126,13 +129,13 @@
     // and re-execing.
     host_javabase = MakeAbsolute(value);
     option_sources["host_javabase"] = rcfile;
+  } else if (GetNullaryOption(
+                 arg, "--experimental_preserve_spaces_in_host_jvm_args")) {
+    preserve_spaces_in_host_jvm_args = true;
+    option_sources["preserve_spaces_in_host_jvm_args"] = rcfile;
   } else if ((value = GetUnaryOption(arg, next_arg,
                                      "--host_jvm_args")) != NULL) {
-    if (host_jvm_args.empty()) {
-      host_jvm_args = value;
-    } else {
-      host_jvm_args = host_jvm_args + " " + value;
-    }
+    host_jvm_args.push_back(value);
     option_sources["host_jvm_args"] = rcfile;  // NB: This is incorrect
   } else if ((value = GetUnaryOption(arg, next_arg, "--blaze_cpu")) != NULL) {
     blaze_cpu = true;