commit a977376cf89df8a5b31d0ebc56a2000dc2ec9c08
author steinman <steinman@google.com> Mon Oct 05 07:26:14 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Oct 05 07:27:43 2020 -0700
tree f3d40ac39fdbfa91b8396ec8750579be7194aa2d
parent b8f43f9d183e771a8dd6eaaf20b1d61fdddf7857

Rename --experimental_allow_json_worker_protocol to --experimental_worker_allow_json_protocol, to match the other worker-related flags, which begin with "worker"

PiperOrigin-RevId: 335412414

src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java
index c9432db..dc07ca8 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java
@@ -47,7 +47,7 @@
   public Void experimentalPersistentJavac;
 
   @Option(
-      name = "experimental_allow_json_worker_protocol",
+      name = "experimental_worker_allow_json_protocol",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},

src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
index 8dc2f30..b008a51 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
@@ -202,7 +202,7 @@
       if (protocolFormat == WorkerProtocolFormat.JSON) {
         throw new IOException(
             "Persistent worker protocol format must be set to proto unless"
-                + " --experimental_allow_json_worker_protocol is used");
+                + " --experimental_worker_allow_json_protocol is used");
       }
     }
 

src/test/shell/integration/bazel_worker_test.sh

diff --git a/src/test/shell/integration/bazel_worker_test.sh b/src/test/shell/integration/bazel_worker_test.sh
index 9b4f11c..40feecb 100755
--- a/src/test/shell/integration/bazel_worker_test.sh
+++ b/src/test/shell/integration/bazel_worker_test.sh
@@ -35,7 +35,7 @@
 
 add_to_bazelrc "build -s"
 add_to_bazelrc "build --spawn_strategy=worker,standalone"
-add_to_bazelrc "build --experimental_allow_json_worker_protocol"
+add_to_bazelrc "build --experimental_worker_allow_json_protocol"
 add_to_bazelrc "build --worker_verbose --worker_max_instances=1"
 add_to_bazelrc "build --debug_print_action_contexts"
 add_to_bazelrc "build ${ADDITIONAL_BUILD_FLAGS}"