Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Hello Martijn, if you have the time to do it the file comparison function that ignores line endings sounds good. Cheers, Antoine Martijn Kruithof wrote: Hi I actually used the same technique as proposed in the bug report on the recorder test cases. Stefan modified that one in such a way that not the files from cvs are fixed but copies of those files. I would propose to either go the same way here or take a better approach in actually write a new file comparison function that has the ability to ignore differences in line endings and use that one for most test cases. Kind Regards, Martijn - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Kev Jackson wrote: If this is related to MD5 checksums, they've recently been proven to not be conclusive proof that the content of the file is the same as the checksum, ie two different files can create the same checksum under certain conditions. Maybe it would be a good idea to add a warning to the checksum doc page that MD5 is now widely thought to be weak, and anyone serious about security should consider (at least) SHA-1? -J. -- Jesse Glick mailto:[EMAIL PROTECTED] x22801 NetBeans, Open APIs http://www.netbeans.org/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
On Wed, 8 Dec 2004, Matt Benson [EMAIL PROTECTED] wrote: Hmm... maybe we should just change the unit test to read the files (using loadfile with a striplinebreaks filter) into properties and compare those rather than using FileUtils.contentEquals(...)? +1 Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
On Wed, 8 Dec 2004, Dominique Devienne [EMAIL PROTECTED] wrote: Isn't the alternative simply to check in the expected files are binary to avoid line ending conversions at all? Won't work since the result of running checksum produces platfirm dependent line ends. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
On Wed, 08 Dec 2004, Martijn Kruithof [EMAIL PROTECTED] wrote: I actually used the same technique as proposed in the bug report on the recorder test cases. Stefan modified that one in such a way that not the files from cvs are fixed but copies of those files. I mainly did so since otherwise you modify your working copy (at least if the original line endings when the files have been checked in are different from your local platform). We shouldn't change the files we've checked out. We already modify the timestamp of jar.xml on each testrun and CVS thinks it has been changed until you do the next cvs up. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
If this is related to MD5 checksums, they've recently been proven to not be conclusive proof that the content of the file is the same as the checksum, ie two different files can create the same checksum under certain conditions. Not sure if this is relevant to the discussion http://developers.slashdot.org/article.pl?sid=04/12/07/2019244tid=93tid=172tid=8 /we can create 'doppelganger' blocks (my term) anywhere inside a file that may be swapped out, one for another, without altering the final MD5 hash. This lets us create any number of binary-inequal files with the same md5sum. But MD5 uses an appendable cascade construction -- in other words, if you happen to find yourself with two files that MD5 to the same hash, an arbitrary payload can be applied to both files and they'll still have the same hash./ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Stefan Bodewig wrote: On Wed, 8 Dec 2004, Matt Benson [EMAIL PROTECTED] wrote: Hmm... maybe we should just change the unit test to read the files (using loadfile with a striplinebreaks filter) into properties and compare those rather than using FileUtils.contentEquals(...)? We could also add a FileUtil.contentEquals(...) variant that ignores differences in line endings. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Kev Jackson wrote: If this is related to MD5 checksums, they've recently been proven to not be conclusive proof that the content of the file is the same as the checksum, ie two different files can create the same checksum under certain conditions. Yes it is. Martijn - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
On 7 Dec 2004, [EMAIL PROTECTED] wrote: Hack to make the testcases pass. Sorry, I didn't manage to follow the bug report. Before I added pluggable output patterns to checksum the tests passed without the fixcrlf, so they should still do - unless I've broken something, which seems to be the case. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
I think it is more a cvs client issue. Some cvs clients on windows convert to dos endings (correct behaviour for non-binary files) and some do not (cygwin cvs client I think does not). Peter Stefan Bodewig wrote: On 7 Dec 2004, [EMAIL PROTECTED] wrote: Hack to make the testcases pass. Sorry, I didn't manage to follow the bug report. Before I added pluggable output patterns to checksum the tests passed without the fixcrlf, so they should still do - unless I've broken something, which seems to be the case. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
On Wed, 08 Dec 2004, Peter Reilly [EMAIL PROTECTED] wrote: I think it is more a cvs client issue. Some cvs clients on windows convert to dos endings (correct behaviour for non-binary files) and some do not (cygwin cvs client I think does not). Still, if it worked before ... Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
--- Stefan Bodewig [EMAIL PROTECTED] wrote: On Wed, 08 Dec 2004, Peter Reilly [EMAIL PROTECTED] wrote: I think it is more a cvs client issue. Some cvs clients on windows convert to dos endings (correct behaviour for non-binary files) and some do not (cygwin cvs client I think does not). Still, if it worked before ... Hmmm... Peter is right, I do use the cygwin cvs client on Windows. But again, if it worked before... if it's a cygwin issue it possibly is dependent on the fact that I have un*x selected as my default filetype. Anyway... -Matt Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Meet the all-new My Yahoo! - Try it today! http://my.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Actually, I have had a quick look at the changes you made.
I do not believe that they will work on windows with
a dos style cvs client.
For example:
the xml target is now:
target name=createMd5
checksum file=../asf-logo.gif fileext=.MD5 /
fixcrlf eol=lf srcdir=.. includes=asf-logo.gif.MD5 /
/target
the test is:
public void testCreateMd5() throws IOException {
FileUtils fileUtils = FileUtils.newFileUtils();
executeTarget(createMd5);
assertTrue(fileUtils.contentEquals(project.resolveFile(expected/asf-logo.gif.md5),
project.resolveFile(../asf-logo.gif.MD5)));
}
The expected file is expected/asf-logo.gif.md5. There will be a one
character
difference between the size of the file with dos line ending and a file
with unix (or mac) line
endings. With the change you make, the test will not compare a file with
dos line endings
to one with unix lineending and so will fail.
Peter
Matt Benson wrote:
--- Stefan Bodewig [EMAIL PROTECTED] wrote:
On Wed, 08 Dec 2004, Peter Reilly
[EMAIL PROTECTED] wrote:
I think it is more a cvs client issue. Some cvs
clients on windows
convert to dos endings (correct behaviour for
non-binary files) and
some do not (cygwin cvs client I think does not).
Still, if it worked before ...
Hmmm... Peter is right, I do use the cygwin cvs client
on Windows. But again, if it worked before... if it's
a cygwin issue it possibly is dependent on the fact
that I have un*x selected as my default filetype.
Anyway...
-Matt
Stefan
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
__
Do you Yahoo!?
Meet the all-new My Yahoo! - Try it today!
http://my.yahoo.com
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Hey, good point, I follow you... if the cvs client
auto-converts the expected files, then they won't
match the fixcrlf'd files. Hmm... maybe we should
just change the unit test to read the files (using
loadfile with a striplinebreaks filter) into
properties and compare those rather than using
FileUtils.contentEquals(...)? Any other ideas?
-Matt
--- Peter Reilly [EMAIL PROTECTED] wrote:
Actually, I have had a quick look at the changes you
made.
I do not believe that they will work on windows with
a dos style cvs client.
For example:
the xml target is now:
target name=createMd5
checksum file=../asf-logo.gif fileext=.MD5
/
fixcrlf eol=lf srcdir=..
includes=asf-logo.gif.MD5 /
/target
the test is:
public void testCreateMd5() throws IOException {
FileUtils fileUtils =
FileUtils.newFileUtils();
executeTarget(createMd5);
assertTrue(fileUtils.contentEquals(project.resolveFile(expected/asf-logo.gif.md5),
project.resolveFile(../asf-logo.gif.MD5)));
}
The expected file is expected/asf-logo.gif.md5.
There will be a one
character
difference between the size of the file with dos
line ending and a file
with unix (or mac) line
endings. With the change you make, the test will not
compare a file with
dos line endings
to one with unix lineending and so will fail.
Peter
Matt Benson wrote:
--- Stefan Bodewig [EMAIL PROTECTED] wrote:
On Wed, 08 Dec 2004, Peter Reilly
[EMAIL PROTECTED] wrote:
I think it is more a cvs client issue. Some cvs
clients on windows
convert to dos endings (correct behaviour for
non-binary files) and
some do not (cygwin cvs client I think does not).
Still, if it worked before ...
Hmmm... Peter is right, I do use the cygwin cvs
client
on Windows. But again, if it worked before... if
it's
a cygwin issue it possibly is dependent on the fact
that I have un*x selected as my default filetype.
Anyway...
-Matt
Stefan
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
__
Do you Yahoo!?
Meet the all-new My Yahoo! - Try it today!
http://my.yahoo.com
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
__
Do you Yahoo!?
The all-new My Yahoo! - Get yours free!
http://my.yahoo.com
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
That sounds like a good idea. Peter Matt Benson wrote: Hey, good point, I follow you... if the cvs client auto-converts the expected files, then they won't match the fixcrlf'd files. Hmm... maybe we should just change the unit test to read the files (using loadfile with a striplinebreaks filter) into properties and compare those rather than using FileUtils.contentEquals(...)? Any other ideas? -Matt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
--- Matt Benson [EMAIL PROTECTED] wrote: [SNIP] match the fixcrlf'd files. Hmm... maybe we should just change the unit test to read the files (using loadfile with a striplinebreaks filter) into properties and compare those rather than using FileUtils.contentEquals(...)? Any other ideas? [SNIP] I will go ahead and commit this as a better alternative to breaking true Windows CVS clients until something better comes along. -Matt __ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.com/new_mail - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Isn't the alternative simply to check in the expected files are binary to avoid line ending conversions at all? Just thinking out loud. --DD From: Matt Benson [mailto:[EMAIL PROTECTED] Sent: Wed 12/8/2004 11:36 AM To: Ant Developers List Subject: Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml Hey, good point, I follow you... if the cvs client auto-converts the expected files, then they won't match the fixcrlf'd files. Hmm... maybe we should just change the unit test to read the files (using loadfile with a striplinebreaks filter) into properties and compare those rather than using FileUtils.contentEquals(...)? Any other ideas? -Matt --- Peter Reilly [EMAIL PROTECTED] wrote: Actually, I have had a quick look at the changes you made. I do not believe that they will work on windows with a dos style cvs client. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
--- Dominique Devienne [EMAIL PROTECTED] wrote: Isn't the alternative simply to check in the expected files are binary to avoid line ending conversions at all? Just thinking out loud. --DD Maybe, but that at least puts us back to the fixcrlf fix since the output files are being written with the system line separator. -Matt __ Do you Yahoo!? Yahoo! Mail - Find what you need with new enhanced search. http://info.mail.yahoo.com/mail_250 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
Hi I actually used the same technique as proposed in the bug report on the recorder test cases. Stefan modified that one in such a way that not the files from cvs are fixed but copies of those files. I would propose to either go the same way here or take a better approach in actually write a new file comparison function that has the ability to ignore differences in line endings and use that one for most test cases. Kind Regards, Martijn - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
bodewig 2004/09/08 07:30:45 Modified:src/etc/testcases/taskdefs checksum.xml Log: more to clean up Revision ChangesPath 1.8 +3 -1 ant/src/etc/testcases/taskdefs/checksum.xml Index: checksum.xml === RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/checksum.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- checksum.xml 8 Sep 2004 14:29:16 - 1.7 +++ checksum.xml 8 Sep 2004 14:30:45 - 1.8 @@ -8,7 +8,9 @@ delete file=../asf-logo.gif.md5sum / delete file=../asf-logo.gif.SVF / delete file=../asf-logo.gif.svf / - delete +delete file=../asf-logo.gif.pattern / +delete file=../asf-logo.gif.PATTERN / +delete fileset dir=checksum include name=**/*.MD5/ /fileset - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
antoine 2003/12/18 00:39:06
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs Checksum.java
src/testcases/org/apache/tools/ant/taskdefs
ChecksumTest.java
src/etc/testcases/taskdefs checksum.xml
Log:
Make checksum work with nested filesets and no total property
Make checksum less loud, downgrading message calculating checksum to verbose
PR: 25606
PR: 25607
Submitted by: Ariel Backenroth ( abackenr at interwoven dot com )
Revision ChangesPath
1.514 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- WHATSNEW 1 Dec 2003 22:10:17 - 1.513
+++ WHATSNEW 18 Dec 2003 08:39:06 - 1.514
@@ -93,6 +93,8 @@
are resolved at a later stage. This causes some
differences especially for user defined task containers.
+* checksum log message Calculating checksum ... has been degraded from
INFO to VERBOSE.
+
Fixed bugs:
---
* Filter readers were not handling line endings properly. Bugzilla
1.35 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Index: Checksum.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Checksum.java 13 Sep 2003 12:58:33 - 1.34
+++ Checksum.java 18 Dec 2003 08:39:06 - 1.35
@@ -374,7 +374,7 @@
String[] srcFiles = ds.getIncludedFiles();
for (int j = 0; j srcFiles.length; j++) {
File src = new File(fs.getDir(getProject()),
srcFiles[j]);
-if (totalproperty != null) {
+if (totalproperty != null || todir != null) {
// Use '/' to calculate digest based on file name.
// This is required in order to get the same result
// on different platforms.
@@ -467,7 +467,7 @@
messageDigest.reset();
File src = (File) e.nextElement();
if (!isCondition) {
-log(Calculating + algorithm + checksum for + src);
+log(Calculating + algorithm + checksum for + src,
Project.MSG_VERBOSE);
}
fis = new FileInputStream(src);
DigestInputStream dis = new DigestInputStream(fis,
1.7 +4 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
Index: ChecksumTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChecksumTest.java 24 Jun 2003 15:40:28 - 1.6
+++ ChecksumTest.java 18 Dec 2003 08:39:06 - 1.7
@@ -125,6 +125,9 @@
expectPropertySet(verifyFromProperty, verify, true);
}
+public void testVerifyChecksumdirNoTotal() {
+executeTarget(verifyChecksumdirNoTotal);
+}
private void testVerify(String target) {
assertNull(project.getProperty(logo.MD5));
assertNull(project.getProperty(no.logo.MD5));
1.6 +8 -0 ant/src/etc/testcases/taskdefs/checksum.xml
Index: checksum.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/checksum.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- checksum.xml 24 Jun 2003 15:40:28 - 1.5
+++ checksum.xml 18 Dec 2003 08:39:06 - 1.6
@@ -65,4 +65,12 @@
/fileset
/checksum
/target
+!-- bug report 25606 --
+target name=verifyChecksumdirNoTotal
+ checksum todir=${basedir}/checksum/checksums
+fileset dir=${basedir}/checksum
+ exclude name=**/*.MD5/
+/fileset
+ /checksum
+/target
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
antoine 2003/12/18 00:54:15
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Checksum.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH ChecksumTest.java
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH checksum.xml
Log:
Merge from HEAD
Make checksum work with nested filesets and no total property
Make checksum less loud, downgrading message calculating checksum to verbose
PR: 25606
PR: 25607
Submitted by: Ariel Backenroth ( abackenr at interwoven dot com )
Revision ChangesPath
No revision
No revision
1.503.2.21 +8 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.20
retrieving revision 1.503.2.21
diff -u -r1.503.2.20 -r1.503.2.21
--- WHATSNEW 17 Dec 2003 16:02:56 - 1.503.2.20
+++ WHATSNEW 18 Dec 2003 08:54:14 - 1.503.2.21
@@ -8,6 +8,10 @@
rather than blocking. If you run such a process and rely on it blocking, as
it would do in Ant 1.5, you may have problem.
+* checksum message calculating checksum downgraded to MSG_VERBOSE
+ to limit output in case of large filesets.
+ Bugzilla Report 25607.
+
* Change logging level of captured standard error output from MSG_ERR to
MSG_WARN.
Previous some standard error was output as MSG_ERR and some as MSG_WARN
(namely
standard error from exec and forked jvms).
@@ -20,6 +24,10 @@
* xmlcatalog Wrong file location to URL conversion in XMLCatalog.
Bugzilla Report 23913.
+
+* checksum was throwing a null pointer exception, when used with nested
filesets
+ and totalproperty attribute not set.
+ Bugzilla Report 25606.
Other changes:
--
No revision
No revision
1.34.2.1 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
Index: Checksum.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- Checksum.java 13 Sep 2003 12:58:33 - 1.34
+++ Checksum.java 18 Dec 2003 08:54:14 - 1.34.2.1
@@ -374,7 +374,7 @@
String[] srcFiles = ds.getIncludedFiles();
for (int j = 0; j srcFiles.length; j++) {
File src = new File(fs.getDir(getProject()),
srcFiles[j]);
-if (totalproperty != null) {
+if (totalproperty != null || todir != null) {
// Use '/' to calculate digest based on file name.
// This is required in order to get the same result
// on different platforms.
@@ -467,7 +467,7 @@
messageDigest.reset();
File src = (File) e.nextElement();
if (!isCondition) {
-log(Calculating + algorithm + checksum for + src);
+log(Calculating + algorithm + checksum for + src,
Project.MSG_VERBOSE);
}
fis = new FileInputStream(src);
DigestInputStream dis = new DigestInputStream(fis,
No revision
No revision
1.6.2.1 +4 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
Index: ChecksumTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- ChecksumTest.java 24 Jun 2003 15:40:28 - 1.6
+++ ChecksumTest.java 18 Dec 2003 08:54:14 - 1.6.2.1
@@ -125,6 +125,9 @@
expectPropertySet(verifyFromProperty, verify, true);
}
+public void testVerifyChecksumdirNoTotal() {
+executeTarget(verifyChecksumdirNoTotal);
+}
private void testVerify(String target) {
assertNull(project.getProperty(logo.MD5));
assertNull(project.getProperty(no.logo.MD5));
No revision
No revision
1.5.2.1 +8 -0 ant/src/etc/testcases/taskdefs/checksum.xml
Index: checksum.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/checksum.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- checksum.xml 24 Jun 2003 15:40:28 - 1.5
+++ checksum.xml 18 Dec 2003 08:54:14 - 1.5.2.1
@@
cvs commit: ant/src/etc/testcases/taskdefs checksum.xml
bodewig 2003/04/09 07:23:01
Modified:src/etc/testcases/taskdefs checksum.xml
Log:
There is no bug
Revision ChangesPath
1.3 +2 -1 ant/src/etc/testcases/taskdefs/checksum.xml
Index: checksum.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/checksum.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- checksum.xml 9 Apr 2003 14:02:23 - 1.2
+++ checksum.xml 9 Apr 2003 14:23:01 - 1.3
@@ -39,6 +39,7 @@
target name=verifyFromProperty
checksum property=checksum file=checksum.xml/
-checksum property=checksum file=checksum.xml
verifyproperty=verify/
+checksum property=${checksum} file=checksum.xml
+ verifyproperty=verify/
/target
/project
