Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-26331] Noting merge of #1519.
  • Loading branch information
jglick committed Jan 9, 2015
2 parents 28984e5 + 1fae8c0 commit 75eeccf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog.html
Expand Up @@ -61,6 +61,9 @@
<li class=bug>
Folder loading broken when child item loading throws exception.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22811">issue 22811</a>)
<li class=bug>
Better support functional tests from Gradle-based plugins.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-26331">issue 26331</a>)
</ul>
</div><!--=TRUNK-END=-->

Expand Down
3 changes: 2 additions & 1 deletion test/src/main/java/org/jvnet/hudson/test/WarExploder.java
Expand Up @@ -88,7 +88,8 @@ private static File explode() throws Exception {
File war = Which.jarFile(Class.forName("executable.Executable"));

// TODO this assumes that the CWD of the Maven process is the plugin ${basedir}, which may not be the case
File explodeDir = new File("./target/jenkins-for-test").getAbsoluteFile();
File buildDirectory = new File(System.getProperty("buildDirectory", "target"));
File explodeDir = new File(buildDirectory, "jenkins-for-test").getAbsoluteFile();
explodeDir.getParentFile().mkdirs();
while (new File(explodeDir + ".exploding").isFile()) {
explodeDir = new File(explodeDir + "x");
Expand Down

0 comments on commit 75eeccf

Please sign in to comment.