ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/etc/testcases/taskdefs/ant references.xml
Date Fri, 28 Jan 2005 09:33:37 GMT
peterreilly    2005/01/28 01:33:37

  Modified:    src/testcases/org/apache/tools/ant/taskdefs Tag:
                        ANT_16_BRANCH AntTest.java
               src/etc/testcases/taskdefs Tag: ANT_16_BRANCH ant.xml
               src/etc/testcases/taskdefs/ant Tag: ANT_16_BRANCH
                        references.xml
  Log:
  sync: test for reference has a project
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.19.2.6  +5 -2      ant/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
  
  Index: AntTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java,v
  retrieving revision 1.19.2.5
  retrieving revision 1.19.2.6
  diff -u -r1.19.2.5 -r1.19.2.6
  --- AntTest.java	14 Dec 2004 23:48:01 -0000	1.19.2.5
  +++ AntTest.java	28 Jan 2005 09:33:37 -0000	1.19.2.6
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2000-2004 The Apache Software Foundation
  + * Copyright  2000-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -29,7 +29,6 @@
   import org.apache.tools.ant.types.Path;
   
   /**
  - * @version $Revision$
    */
   public class AntTest extends BuildFileTest {
   
  @@ -173,6 +172,10 @@
                         new boolean[] {false, true}, p);
       }
   
  +    public void testInheritPath() {
  +        executeTarget("testInheritPath");
  +    }
  +
       protected void testReference(String target, String[] keys,
                                    boolean[] expect, Object value) {
           ReferenceChecker rc = new ReferenceChecker(keys, expect, value);
  
  
  
  No                   revision
  No                   revision
  1.12.2.2  +14 -0     ant/src/etc/testcases/taskdefs/ant.xml
  
  Index: ant.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/ant.xml,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- ant.xml	14 Dec 2004 23:48:00 -0000	1.12.2.1
  +++ ant.xml	28 Jan 2005 09:33:37 -0000	1.12.2.2
  @@ -82,6 +82,20 @@
       </ant>
     </target>
   
  +  <target name="testInheritPath" description="try to pass a reference to a path, which
refers itself to a second path">
  +    <property name="rootdir" location="."/>
  +    <path id="project.classpath">
  +      <pathelement location="../classes"/>
  +    </path>
  +    <path id="test.classpath">
  +      <pathelement location="${rootdir}/test/testframework.jar"/>
  +      <path refid="project.classpath"/>
  +    </path>
  +    <ant antfile="ant/references.xml"  target="testInheritPath">
  +      <reference refid="test.classpath"/>
  +    </ant>
  +  </target>
  +
     <target name="testLogfilePlacement">
       <ant antfile="ant.xml" target="dummy" output="test1.log"
            inheritall="false" />
  
  
  
  No                   revision
  No                   revision
  1.1.4.1   +7 -1      ant/src/etc/testcases/taskdefs/ant/references.xml
  
  Index: references.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/ant/references.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- references.xml	10 Dec 2001 10:10:35 -0000	1.1
  +++ references.xml	28 Jan 2005 09:33:37 -0000	1.1.4.1
  @@ -7,4 +7,10 @@
     </target>
   
     <target name="dummy" />
  -</project>
  \ No newline at end of file
  +
  +  <target name="testInheritPath">
  +    <pathconvert refid="test.classpath" pathsep="${line.separator}" property="myprop"/>
  +    <echo>${myprop}</echo>
  +  </target>
  +
  +</project>
  
  
  

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


Mime
View raw message