diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 0c73a3e41..3bbd08707 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -415,6 +415,7 @@ public class ProjectHelper2 extends ProjectHelper { if (!file.isAbsolute()) { file = FILE_UTILS.resolveFile(context.getBuildFileParent(), path); } + context.getProject().log("file=" + file, Project.MSG_DEBUG); try { InputSource inputSource = new InputSource(new FileInputStream(file)); @@ -427,6 +428,8 @@ public class ProjectHelper2 extends ProjectHelper { } // use default if not file or file not found + context.getProject().log( + "could not resolve systemId", Project.MSG_DEBUG); return null; } diff --git a/src/testcases/org/apache/tools/ant/IncludeTest.java b/src/testcases/org/apache/tools/ant/IncludeTest.java index 4a031ab9e..ab56faa91 100644 --- a/src/testcases/org/apache/tools/ant/IncludeTest.java +++ b/src/testcases/org/apache/tools/ant/IncludeTest.java @@ -17,6 +17,8 @@ package org.apache.tools.ant; +import junit.framework.AssertionFailedError; + import org.apache.tools.ant.BuildFileTest; /** @@ -109,7 +111,12 @@ public class IncludeTest extends BuildFileTest { public void testWithSpaceInclude() { 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() {