Author: mbenson
Date: Thu Sep 21 12:19:49 2006
New Revision: 448640
URL: http://svn.apache.org/viewvc?view=rev&rev=448640
Log:
make this work even when my cygwin-based svn checks out files in \n but my JVM
thinks line.separator = \r\n
Modified:
ant/core/trunk/src/etc/testcases/taskdefs/input.xml
Modified: ant/core/trunk/src/etc/testcases/taskdefs/input.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/input.xml?view=diff&rev=448640&r1=448639&r2=448640
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/input.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/input.xml Thu Sep 21 12:19:49 2006
@@ -58,11 +58,11 @@
<input message="Press Return key to continue..." addproperty="test">
<handler type="greedy" />
</input>
+ <loadfile srcFile="input.stdin" property="input" />
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}"
- arg2="foo${line.separator}bar${line.separator}" />
+ <equals arg1="${test}" arg2="${input}" />
</not>
</condition>
</fail>
@@ -72,11 +72,11 @@
<input message="Press Return key to continue..." addproperty="test">
<handler classname="org.apache.tools.ant.input.GreedyInputHandler" />
</input>
+ <loadfile srcFile="input.stdin" property="input" />
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}"
- arg2="foo${line.separator}bar${line.separator}" />
+ <equals arg1="${test}" arg2="${input}" />
</not>
</condition>
</fail>
@@ -90,11 +90,11 @@
<input message="Press Return key to continue..." addproperty="test">
<handler refid="greedy" />
</input>
+ <loadfile srcFile="input.stdin" property="input" />
<fail message="$${test} = ${test}">
<condition>
<not>
- <equals arg1="${test}"
- arg2="foo${line.separator}bar${line.separator}" />
+ <equals arg1="${test}" arg2="${input}" />
</not>
</condition>
</fail>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
