diff options
author | 2016-07-27 14:48:43 +0000 | |
---|---|---|
committer | 2016-07-28 18:36:28 -0400 | |
commit | e7cd933c441aa09810e365c0005f622cd317911a (patch) | |
tree | 6f0ddc57c5362113c2593e2fd18cc37feebcc9eb /src/test/java/com/google/devtools/build | |
parent | 974bbd92080ec47ebeef8fb99c6178cbf3fe7e1e (diff) |
Start worker processes with a clean environment, instead of accidentally inheriting a copy of the server's environment.
--
MOS_MIGRATED_REVID=128584538
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java | 6 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java index 21c089c088..9c9c5a032e 100644 --- a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java +++ b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorker.java @@ -159,6 +159,12 @@ public class ExampleWorker { } } + if (options.printEnv) { + for (Entry<String, String> entry : System.getenv().entrySet()) { + outputs.add(entry.getKey() + "=" + entry.getValue()); + } + } + String outputStr = Joiner.on('\n').join(outputs); if (options.outputFile.isEmpty()) { System.out.println(outputStr); diff --git a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java index 7456e4b331..4de906a2ea 100644 --- a/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java +++ b/src/test/java/com/google/devtools/build/lib/worker/ExampleWorkerOptions.java @@ -51,6 +51,13 @@ public class ExampleWorkerOptions extends OptionsBase { help = "Writes a list of input files and their digests." ) public boolean printInputs; + + @Option( + name = "print_env", + defaultValue = "false", + help = "Prints a list of all environment variables." + ) + public boolean printEnv; } @Option(name = "persistent_worker", defaultValue = "false") |