diff options
| author |  ulfjack <ulfjack@google.com> | 2017-06-06 09:32:18 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-06-06 09:51:28 -0400 |
| commit | 95aa487c02e20c6e0e137fca1670fc72ec9bd588 (patch) | |
| tree | a16afba1b593ee011673f1aaadb9aafd641e3730 /src/test | |
| parent | 75b58db8bc94f591f64d83ff532128e1c672818a (diff) | |
Remove the CommandEnvironment from BlazeCommand.editOptions
BlazeCommand.editOptions is currently called fairly late in the startup
process, so it must be restrictive in what it does, as any change to the
options can potentially introduce inconsistencies between different parts of
Bazel. Removing the CommandEnvironment reduces the amount of damage it can do,
and may allow us to move the call earlier in the startup process (maybe even
to a point where the CommandEnvironment does not exist yet).
PiperOrigin-RevId: 158133862
Diffstat (limited to 'src/test')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java index 6f90f033b2..e2bc10b2b2 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java @@ -57,7 +57,7 @@ public class AbstractCommandTest { } @Override - public void editOptions(CommandEnvironment env, OptionsParser optionsParser) {} + public void editOptions(OptionsParser optionsParser) {} } @Command(name = "test_name", diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java index 105d2b8eae..2ae0b12e76 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcherRcoptionsTest.java @@ -79,7 +79,7 @@ public class BlazeCommandDispatcherRcoptionsTest { } @Override - public void editOptions(CommandEnvironment env, OptionsParser optionsParser) {} + public void editOptions(OptionsParser optionsParser) {} } @Command( @@ -101,7 +101,7 @@ public class BlazeCommandDispatcherRcoptionsTest { } @Override - public void editOptions(CommandEnvironment env, OptionsParser optionsParser) {} + public void editOptions(OptionsParser optionsParser) {} } @Command( diff --git a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java index db965e5f88..cb6c5942a6 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/CommandInterruptionTest.java @@ -92,7 +92,7 @@ public final class CommandInterruptionTest { } @Override - public void editOptions(CommandEnvironment env, OptionsParser optionsParser) {} + public void editOptions(OptionsParser optionsParser) {} /** * Runs an instance of this command on the given executor, waits for it to start and returns a |