From 96582825bb0aa22dc019292909dee00029216068 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 4 Mar 2008 13:17:50 +0000
Subject: [PATCH] Ensure the line-ends match the platforms expectation in
 UTF-16 case.  I can't seem to find a way that svn will accept UTF-16 and
 native eol-style, so I fall back to the trusted fixcrlf.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@633469 13f79535-47bb-0310-9956-ffa450edef68
---
 .../types/resources/concat-resource-test.xml      |  14 +++++++++++++-
 src/tests/antunit/types/resources/utf-16.in       | Bin
 2 files changed, 13 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 src/tests/antunit/types/resources/utf-16.in

diff --git a/src/tests/antunit/types/resources/concat-resource-test.xml b/src/tests/antunit/types/resources/concat-resource-test.xml
index 29ea74446..a3f37a7e0 100644
--- a/src/tests/antunit/types/resources/concat-resource-test.xml
+++ b/src/tests/antunit/types/resources/concat-resource-test.xml
@@ -8,6 +8,12 @@
   <property name="br" value="${line.separator}" />
   <property name="world" value="World" />
 
+  <property name="out.dir" location="tempdir"/>
+
+  <target name="tearDown">
+    <delete dir="${out.dir}" quiet="true"/>
+  </target>
+
   <target name="testCountEquals1">
     <au:assertTrue>
       <resourcecount count="1">
@@ -52,9 +58,15 @@
   </target>
 
   <target name="testEncoding">
+    <mkdir dir="${out.dir}"/>
+    <copy file="utf-16.in" toDir="${out.dir}" encoding="utf-16">
+      <filterchain>
+        <fixcrlf/>
+      </filterchain>
+    </copy>
     <au:assertTrue>
       <resourcesmatch astext="true">
-        <file file="utf-16.in" />
+        <file file="${out.dir}/utf-16.in" />
         <concat outputEncoding="utf-16">foo${br}bar${br}baz${br}</concat>
         <concat outputEncoding="utf-16" fixlastline="true">
           <string value="foo" />
diff --git a/src/tests/antunit/types/resources/utf-16.in b/src/tests/antunit/types/resources/utf-16.in
old mode 100755
new mode 100644