You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by mb...@apache.org on 2005/10/21 21:21:36 UTC
svn commit: r327253 - in /ant/core/trunk/src:
main/org/apache/tools/ant/helper/ProjectHelper2.java
testcases/org/apache/tools/ant/IncludeTest.java
Author: mbenson
Date: Fri Oct 21 12:21:29 2005
New Revision: 327253
URL: http://svn.apache.org/viewcvs?rev=327253&view=rev
Log:
Add debugging messages for Gump failure.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
ant/core/trunk/src/testcases/org/apache/tools/ant/IncludeTest.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java?rev=327253&r1=327252&r2=327253&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Fri Oct 21 12:21:29 2005
@@ -415,6 +415,7 @@
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 @@
}
// use default if not file or file not found
+ context.getProject().log(
+ "could not resolve systemId", Project.MSG_DEBUG);
return null;
}
Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/IncludeTest.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/IncludeTest.java?rev=327253&r1=327252&r2=327253&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/IncludeTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/IncludeTest.java Fri Oct 21 12:21:29 2005
@@ -17,6 +17,8 @@
package org.apache.tools.ant;
+import junit.framework.AssertionFailedError;
+
import org.apache.tools.ant.BuildFileTest;
/**
@@ -109,7 +111,12 @@
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() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org