[JENKINS-30457] Allow dot-segments relative path to maintain backward…

…s compatibility with 1.1.2 and previous versions.
jenkinsci · Apr 22, 2016 · fc55c2f · fc55c2f
1 parent 098b854
commit fc55c2f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/MsTestBuilder.java b/src/main/java/org/jenkinsci/plugins/MsTestBuilder.java
@@ -209,10 +209,16 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
 						testContainers.add(testFile);
 					}
             	} else {
-					for (FilePath tcFilePath : workspace.list(testFile)) {
-						// TODO make path relative to workspace to reduce length of command line (see windows max size)
-	            		testContainers.add(tcFilePath.getRemote());
-					}
+                    FilePath testFilePath = workspace.child(testFile);
+                    // JENKINS-30457. To support dot-segments and maintain backwards compatibility since it was supported up till 1.1.2
+                    if (testFilePath.exists()) {
+                        testContainers.add(testFilePath.getRemote());
+                    } else {
+                        for (FilePath tcFilePath : workspace.list(testFile)) {
+                            // TODO make path relative to workspace to reduce length of command line (see windows max size)
+                            testContainers.add(tcFilePath.getRemote());
+                        }
+                    }
             	}
             }
         }

diff --git a/src/main/resources/org/jenkinsci/plugins/MsTestBuilder/help-testFiles.html b/src/main/resources/org/jenkinsci/plugins/MsTestBuilder/help-testFiles.html
@@ -2,7 +2,8 @@
     <p>
         Specify the path to your MSTest compiled assemblies.<br />
         You can specify multiple test assemblies by separating them with new-line.<br />
-        You can use either relative path to the workspace or full path. Spaces in the path are allowed.
+        You can use either relative path to the workspace or full path. Spaces in the path are allowed.<br />
+        You can use Ant-style filters. i.e - foo/*, foo/**/bar.dll, foo/*.dll
     </p>
 </div>
 <div>