ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/filters ConcatFilterTest.java
Date Thu, 13 May 2004 07:01:49 GMT
bodewig     2004/05/13 00:01:49

  Modified:    src/etc/testcases/filters concat.xml
               src/testcases/org/apache/tools/ant/filters
                        ConcatFilterTest.java
  Log:
  Make tests pass on MacOS X.
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.5       +2 -0      ant/src/etc/testcases/filters/concat.xml
  
  Index: concat.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/filters/concat.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- concat.xml	25 Sep 2003 06:12:25 -0000	1.4
  +++ concat.xml	13 May 2004 07:01:48 -0000	1.5
  @@ -7,6 +7,8 @@
       <echo file="result/append.txt" message="this-should-be-the-last-line${line.separator}"/>
       <copy file="input/head-tail.test" tofile="input/concatfilter.test"/>
       <fixcrlf srcDir="input" includes="concatfilter.test"/>
  +    <!-- to be consistent on MacOS X.  fixcrlf uses CR while line.sep is LF -->
  +    <fixcrlf srcDir="result" includes="append.txt,prepend.txt"/>
     </target>
   
     <target name="cleanup">
  
  
  
  1.11      +3 -1      ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
  
  Index: ConcatFilterTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ConcatFilterTest.java	9 Mar 2004 16:48:56 -0000	1.10
  +++ ConcatFilterTest.java	13 May 2004 07:01:49 -0000	1.11
  @@ -21,6 +21,7 @@
   import java.io.IOException;
   
   import org.apache.tools.ant.BuildFileTest;
  +import org.apache.tools.ant.taskdefs.condition.Os;
   import org.apache.tools.ant.util.FileUtils;
   
   /**
  @@ -29,7 +30,8 @@
   public class ConcatFilterTest extends BuildFileTest {
   
       private static FileUtils fu = FileUtils.newFileUtils();
  -    private static final String lSep = System.getProperty("line.separator");
  +    private static final String lSep = 
  +        Os.isFamily("mac") ? "\r" : System.getProperty("line.separator");
   
       private static final String FILE_PREPEND_WITH =
             "this-should-be-the-first-line" + lSep
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message