Browse Source

Make tag and date attributes of <cvs> work again as well.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272198 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
ea60c3f749
4 changed files with 23 additions and 2 deletions
  1. +13
    -0
      src/etc/testcases/taskdefs/abstractcvstask.xml
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  3. +2
    -1
      src/testcases/org/apache/tools/ant/BuildFileTest.java
  4. +7
    -0
      src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java

+ 13
- 0
src/etc/testcases/taskdefs/abstractcvstask.xml View File

@@ -31,6 +31,19 @@
quiet="true" />
</target>

<target name="tag-attribute">
<mkdir dir="tmpdir" />
<cvs cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
package="jakarta-ant/build.xml"
dest="tmpdir"
quiet="true"
tag="ANT_141" />
<cvs cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
package="jakarta-ant/build.xml"
dest="tmpdir"
command="status"/>
</target>

<target name="cleanup">
<delete dir="tmpdir" />
</target>


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java View File

@@ -377,7 +377,7 @@ public abstract class AbstractCvsTask extends Task {

String c = this.getCommand();
if( c != null ) {
this.cmd.createArgument().setLine(c);
this.cmd.createArgument(true).setLine(c);
this.addConfiguredCommandline( this.cmd, true );
}



+ 2
- 1
src/testcases/org/apache/tools/ant/BuildFileTest.java View File

@@ -115,7 +115,8 @@ public abstract class BuildFileTest extends TestCase {
protected void expectLogContaining(String target, String log) {
executeTarget(target);
String realLog = getLog();
assertTrue("expecting log to contain \""+log+"\"",
assertTrue("expecting log to contain \""+log+"\" log was \""
+ realLog + "\"",
realLog.indexOf(log) >= 0);
}



+ 7
- 0
src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java View File

@@ -90,4 +90,11 @@ public class AbstractCvsTaskTest extends BuildFileTest {
expectLogContaining("package-attribute", "U jakarta-ant/build.xml");
assertTrue("now it is there", f.exists());
}

public void testTagAttribute() {
File f = getProject().resolveFile("tmpdir/jakarta-ant/build.xml");
assertTrue("starting empty", !f.exists());
expectLogContaining("tag-attribute", "ANT_141 (revision: 1.175.2.13)");
assertTrue("now it is there", f.exists());
}
}

Loading…
Cancel
Save