Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #10 from armfergom/JENKINS-30457
[JENKINS-30457] Relative paths to test files with dots failing.
  • Loading branch information
ido-ran committed May 5, 2016
2 parents 45e2597 + fc55c2f commit e877ea9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
14 changes: 10 additions & 4 deletions src/main/java/org/jenkinsci/plugins/MsTestBuilder.java
Expand Up @@ -214,10 +214,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());
}
}
}
}
}
Expand Down
Expand Up @@ -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>
Expand Down

0 comments on commit e877ea9

Please sign in to comment.