From 18b6cf346cc0a4b0deeab7fcb92254d74b1e3ec9 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 7 Apr 2012 04:30:09 +0000
Subject: [PATCH] if test-directory contains spaces, an includes attribute will
 split it into several patterns

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1310674 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/types/resources/test.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/tests/antunit/types/resources/test.xml b/src/tests/antunit/types/resources/test.xml
index 0de2bf8b7..4b507ede2 100644
--- a/src/tests/antunit/types/resources/test.xml
+++ b/src/tests/antunit/types/resources/test.xml
@@ -170,7 +170,9 @@
           </path>
           <pathelement id="pe" location="${dir}" /> <!-- 1 -->
           <filelist id="fl" dir="${bar}" files="1,2,3,a,b,c" /> <!-- 6 -->
-          <files id="f" includes="${bar}/" /> <!-- 13; 3 overlap fl -->
+          <files id="f"> <!-- 13; 3 overlap fl -->
+            <include name="${bar}/"/>
+          </files>
         </path>
       </resourcecount>
     </au:assertTrue>
@@ -212,10 +214,16 @@
     <au:assertTrue>
       <resourcecount count="4">
         <union>
-          <files includes="${foo.a}/w,${foo.a}/x" /> <!-- 1 -->
+          <files> <!-- 1 -->
+            <include name="${foo.a}/w"/>
+            <include name="${foo.a}/x"/>
+          </files>
           <fileset dir="${foo.a}" includes="x,y" /> <!-- 2; net 1 -->
           <filelist dir="${foo.a}" files="v" /> <!-- 1 -->
-          <files includes="${foo.a}/y,${foo.a}/z" /> <!-- 2; net 1 -->
+          <files>  <!-- 2; net 1 -->
+            <include name="${foo.a}/y"/>
+            <include name="${foo.a}/z"/>
+          </files>
         </union>
       </resourcecount>
     </au:assertTrue>