From e8f24b5abbcc24006eac5cea23cff74791fbea07 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 11 Dec 2001 15:45:41 +0000
Subject: [PATCH] JDK 1.1 doesn't grok UTF16 8-(

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270122 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                                    | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 0e5e25f43..826366526 100644
--- a/build.xml
+++ b/build.xml
@@ -841,7 +841,8 @@
   <target name="run-tests" depends="dump-info,compile-tests" if="junit.present">
 
 
-    <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
+    <junit printsummary="no" haltonfailure="yes" 
+           fork="${junit.fork}">
 <!--      <jvmarg value="-classic"/> -->
       <classpath refid="tests-classpath"/>
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
index 2d4d7f0da..50a2224bf 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
@@ -58,6 +58,7 @@ import java.io.*;
 
 import junit.framework.AssertionFailedError;
 import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
 
 /**
  * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
@@ -161,6 +162,10 @@ public class FixCrLfTest extends BuildFileTest {
     }
 
     public void testEncoding() throws IOException { 
+        if (project.getJavaVersion() == Project.JAVA_1_1) {
+            // UTF16 is not supported in JDK 1.1
+            return;
+        }
         executeTarget("testEncoding");
         assertEqualContent(new File("src/etc/testcases/taskdefs/fixcrlf/expected/input.lf.utf16"),
                            new File("src/etc/testcases/taskdefs/fixcrlf/result/input.crlf.utf16"));