[FIXED JENKINS-29226] improved command line parsing WRT environment a…

…nd build parameters
jenkinsci · Jul 4, 2015 · ca20631 · ca20631
1 parent ffa82b8
commit ca20631
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/unity3d/Unity3dBuilder.java b/src/main/java/org/jenkinsci/plugins/unity3d/Unity3dBuilder.java
@@ -242,13 +242,15 @@ ArgumentListBuilder createCommandlineArgs(String exe, String moduleRootRemote, E
         args.add(exe);
 
         String theArgLine = getArgLineOrGlobalArgLine();
-        if (!theArgLine.contains("-projectPath")) {
-           args.add("-projectPath", moduleRootRemote);
-        }
-
+
         String finalArgLine = Util.replaceMacro(theArgLine, buildVariables);
         finalArgLine = Util.replaceMacro(finalArgLine, vars);
-
+        finalArgLine = Util.replaceMacro(finalArgLine, buildVariables);
+
+        if (!finalArgLine.contains("-projectPath")) {
+            args.add("-projectPath", moduleRootRemote);
+        }
+
         args.add(QuotedStringTokenizer.tokenize(finalArgLine));
         return args;
     }

diff --git a/src/test/java/org/jenkinsci/plugins/unity3d/Unity3dBuilderTest.java b/src/test/java/org/jenkinsci/plugins/unity3d/Unity3dBuilderTest.java
@@ -79,6 +79,24 @@ public void environmentAndBuildVariablesParsing() {
         assertEquals("Serialized arg line not modified", argLine, builder.getArgLine());
     }
 
+    @Test
+    public void environmentAndBuildVariablesParsingWithEnvVarsThatReferencesBuildParameters() {
+        EnvVars vars = new EnvVars();
+        vars.put("ARGS", "-projectPath $param");
+
+        Map<String,String> buildParameters = new Hashtable<String,String>();
+        buildParameters.put("param", "XXXX");
+
+        argLine = "-p1 v1 $ARGS";
+        expectedArgs = asList(exe, "-p1", "v1", "-projectPath", "XXXX");
+
+        Unity3dBuilder builder = new Unity3dBuilder("Unity 3.5", argLine, "");
+        ArgumentListBuilder commandlineArgs = builder.createCommandlineArgs(exe, moduleRootRemote, vars, buildParameters);
+        assertEquals(expectedArgs, commandlineArgs.toList());
+        assertEquals("Serialized arg line not modified", argLine, builder.getArgLine());
+    }
+
+
     @Test
     public void unstableErrorCodesParsing() throws Exception {
         ensureUnstableReturnCodesParsingWorks(new Integer[]{}, "");