From e69aa121510d4d3bd467d6bf86f5c48d00d0f8b9 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 29 May 2012 11:17:16 -0700 Subject: [PATCH] no 'main' directory any more --- test/src/main/java/org/jvnet/hudson/test/WarExploder.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/WarExploder.java b/test/src/main/java/org/jvnet/hudson/test/WarExploder.java index 477567ad81..6531553c5d 100644 --- a/test/src/main/java/org/jvnet/hudson/test/WarExploder.java +++ b/test/src/main/java/org/jvnet/hudson/test/WarExploder.java @@ -65,16 +65,11 @@ final class WarExploder { * Explodes hudson.war, if necessary, and returns its root dir. */ private static File explode() throws Exception { - // are we in the hudson main workspace? If so, pick up hudson/main/war/resources + // are we in the Jenkins main workspace? If so, pick up hudson/main/war/resources // this saves the effort of packaging a war file and makes the debug cycle faster File d = new File(".").getAbsoluteFile(); - // just in case we were started from hudson instead of from hudson/main/... - if (new File(d, "main/war/target/jenkins").exists()) { - return new File(d, "main/war/target/jenkins"); - } - for( ; d!=null; d=d.getParentFile()) { if(new File(d,".jenkins").exists()) { File dir = new File(d,"war/target/jenkins"); -- GitLab