Fix #5 - correctly pass environment variables

carlpett · Feb 13, 2016 · 5b1e10e · 5b1e10e
1 parent af7c591
commit 5b1e10e
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/xunit-agent/src/main/java/se/capeit/dev/xunittestrunner/XUnitBuildProcess.java b/xunit-agent/src/main/java/se/capeit/dev/xunittestrunner/XUnitBuildProcess.java
@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.io.InputStream;
+import java.util.Map;
 import java.util.Scanner;
 
 class XUnitBuildProcess extends FutureBasedBuildProcess {
@@ -63,7 +64,16 @@ public BuildFinishedStatus call() throws Exception {
 
                 String filePath = assembly.getAbsolutePath();
                 String commandLineFlags = getCommandLineFlags(version);
-                Process process = new ProcessBuilder(runnerPath, filePath, commandLineFlags).start();
+                ProcessBuilder processBuilder = new ProcessBuilder(runnerPath, filePath, commandLineFlags);
+
+                // Copy environment variables
+                Map<String, String> env = processBuilder.environment();
+                for(Map.Entry<String, String> kvp : context.getBuildParameters().getEnvironmentVariables().entrySet()) {
+                    env.put(kvp.getKey(), kvp.getValue());
+                }
+
+                Process process = processBuilder.start();
+
                 redirectStreamToLogger(process.getInputStream(), new RedirectionTarget() {
                     public void redirect(String s) {
                         logger.message(s);