From 2d89206b92d8fdcef2264e5e99df88e78478c18a Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Thu, 23 Feb 2012 20:12:57 +0000
Subject: [PATCH] Some tests which failed when run with CWD not equal to
 ${basedir}.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1292935 13f79535-47bb-0310-9956-ffa450edef68
---
 .../junit/org/apache/tools/ant/taskdefs/ManifestTest.java     | 2 +-
 .../org/apache/tools/ant/util/ReaderInputStreamTest.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
index 225473ce1..a785c01bd 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ManifestTest.java
@@ -224,7 +224,7 @@ public class ManifestTest extends BuildFileTest {
         value = mainSection.getAttributeValue(NOT_LONG_NAME);
         assertEquals("NOT_LONG_NAME_VALUE_MISMATCH", VALUE, value);
         
-        BufferedReader in = new BufferedReader(new FileReader(EXPANDED_MANIFEST));
+        BufferedReader in = new BufferedReader(new FileReader(new File(System.getProperty("root"), EXPANDED_MANIFEST)));
         
         Set set = new HashSet();
         String read = in.readLine();
diff --git a/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java b/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
index 54aed69c4..ed3d81fef 100644
--- a/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/ReaderInputStreamTest.java
@@ -79,7 +79,7 @@ public class ReaderInputStreamTest extends TestCase {
         ReaderInputStream r = null;
         FileInputStream utf8 = null;
         try {
-            fin = new InputStreamReader(new FileInputStream("src/tests/antunit/taskdefs/exec/input/iso8859-1"),
+            fin = new InputStreamReader(new FileInputStream(new File(System.getProperty("root"), "src/tests/antunit/taskdefs/exec/input/iso8859-1")),
                                         "ISO8859_1");
             r = new ReaderInputStream(fin, "UTF8");
 
@@ -90,7 +90,7 @@ public class ReaderInputStreamTest extends TestCase {
                 b = r.read();
             }
 
-            utf8 = new FileInputStream("src/tests/antunit/taskdefs/exec/expected/utf-8");
+            utf8 = new FileInputStream(new File(System.getProperty("root"), "src/tests/antunit/taskdefs/exec/expected/utf-8"));
             ByteArrayOutputStream expectedOS = new ByteArrayOutputStream();
             b = utf8.read();
             while (b > -1) {