git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@327253 13f79535-47bb-0310-9956-ffa450edef68master
@@ -415,6 +415,7 @@ public class ProjectHelper2 extends ProjectHelper { | |||||
if (!file.isAbsolute()) { | if (!file.isAbsolute()) { | ||||
file = FILE_UTILS.resolveFile(context.getBuildFileParent(), path); | file = FILE_UTILS.resolveFile(context.getBuildFileParent(), path); | ||||
} | } | ||||
context.getProject().log("file=" + file, Project.MSG_DEBUG); | |||||
try { | try { | ||||
InputSource inputSource = | InputSource inputSource = | ||||
new InputSource(new FileInputStream(file)); | new InputSource(new FileInputStream(file)); | ||||
@@ -427,6 +428,8 @@ public class ProjectHelper2 extends ProjectHelper { | |||||
} | } | ||||
// use default if not file or file not found | // use default if not file or file not found | ||||
context.getProject().log( | |||||
"could not resolve systemId", Project.MSG_DEBUG); | |||||
return null; | return null; | ||||
} | } | ||||
@@ -17,6 +17,8 @@ | |||||
package org.apache.tools.ant; | package org.apache.tools.ant; | ||||
import junit.framework.AssertionFailedError; | |||||
import org.apache.tools.ant.BuildFileTest; | import org.apache.tools.ant.BuildFileTest; | ||||
/** | /** | ||||
@@ -109,7 +111,12 @@ public class IncludeTest extends BuildFileTest { | |||||
public void testWithSpaceInclude() { | public void testWithSpaceInclude() { | ||||
configureProject("src/etc/testcases/core/include/with space/include.xml"); | configureProject("src/etc/testcases/core/include/with space/include.xml"); | ||||
expectLog("test1", "from included entity in 'with space'"); | |||||
try { | |||||
expectLog("test1", "from included entity in 'with space'"); | |||||
} catch (Throwable t) { | |||||
throw new AssertionFailedError( | |||||
t.toString() + "; log=\n" + getFullLog()); | |||||
} | |||||
} | } | ||||
public void testWithSpaceSimple() { | public void testWithSpaceSimple() { | ||||