jkf 2005/02/26 13:03:44
Modified: src/etc/testcases/types redirector.xml
src/testcases/org/apache/tools/ant/types
RedirectorElementTest.java
Log:
RedirectorElementTest stopped working on windows w/h cat on the path.
Now it passes the testcase if cat is not available.
Revision Changes Path
1.4 +3 -0 ant/src/etc/testcases/types/redirector.xml
Index: redirector.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/types/redirector.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- redirector.xml 10 Feb 2005 22:32:21 -0000 1.3
+++ redirector.xml 26 Feb 2005 21:03:44 -0000 1.4
@@ -22,6 +22,9 @@
</target>
<target name="testLogInputString" depends="cat-check" if="can-cat">
+ <echo>
+ testLogInputString can-cat
+ </echo>
<exec executable="cat">
<redirector inputstring="foo" loginputstring="false" />
</exec>
1.3 +3 -1
ant/src/testcases/org/apache/tools/ant/types/RedirectorElementTest.java
Index: RedirectorElementTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/RedirectorElementTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RedirectorElementTest.java 10 Feb 2005 22:32:20 -0000 1.2
+++ RedirectorElementTest.java 26 Feb 2005 21:03:44 -0000 1.3
@@ -51,6 +51,8 @@
public void testLogInputString() {
executeTarget("testLogInputString");
- assertDebuglogContaining("Using input string");
+ if (super.getLog().indexOf("testLogInputString can-cat") >=0 ) {
+ assertDebuglogContaining("Using input string");
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
