Return-Path: Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 66659 invoked by uid 500); 19 Jul 2003 16:11:57 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 66646 invoked from network); 19 Jul 2003 16:11:57 -0000 Received: from relay.t-intra.de (HELO relay.t-online-com.de) (62.156.147.74) by daedalus.apache.org with SMTP; 19 Jul 2003 16:11:57 -0000 Received: from DJ0X820J (p5080eb31.dip0.t-ipconnect.de [80.128.235.49]) by relay.t-online-com.de (SMTPSVC(1.0.0.1)) with ESMTP id C1057150024 for ; Sat, 19 Jul 2003 20:11:39 +0200 (CEST) Message-ID: <009b01c34e10$a5df6470$020200c0@DJ0X820J> From: "Antoine Levy-Lambert" To: "Ant Developers List" References: <20030719155721.2724.qmail@icarus.apache.org> Subject: Re: cvs commit: ant/src/testcases/org/apache/tools/ant DirectoryScannerTest.java Date: Sat, 19 Jul 2003 18:13:09 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1106 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N There is a problem here : with a nightly build of ant of July 10th 2003 (before I begun doing my optimizations to DirectoryScanner), DirectoryScanner did not restitute included files and directories according to the case of the include patterns like now, but according the case of the files and directories on disk. So I need to find out how to change DirectoryScanner so that it behaves again like on July 10th, and also revert my change in the testcase. Antoine. ----- Original Message ----- From: To: Sent: Saturday, July 19, 2003 5:57 PM Subject: cvs commit: ant/src/testcases/org/apache/tools/ant DirectoryScannerTest.java > antoine 2003/07/19 08:57:21 > > Modified: src/testcases/org/apache/tools/ant DirectoryScannerTest.java > Log: > make the new tests involving case sensitivity or not pass on Windows > > Revision Changes Path > 1.16 +19 -4 ant/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java > > Index: DirectoryScannerTest.java > =================================================================== > RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java,v > retrieving revision 1.15 > retrieving revision 1.16 > diff -u -r1.15 -r1.16 > --- DirectoryScannerTest.java 16 Jul 2003 13:34:14 -0000 1.15 > +++ DirectoryScannerTest.java 19 Jul 2003 15:57:21 -0000 1.16 > @@ -120,7 +120,11 @@ > ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); > ds.setIncludes(new String[] {"alpha/beta/gamma/GAMMA.XML"}); > ds.scan(); > - compareFiles(ds, new String[] {}, new String[] {}); > + if (Os.isFamily("dos")) { > + compareFiles(ds, new String[] {"alpha/beta/gamma/GAMMA.XML"}, new String[] {}); > + } else { > + compareFiles(ds, new String[] {}, new String[] {}); > + } > } > > public void testFullPathMatchesCaseInsensitive() { > @@ -129,8 +133,13 @@ > ds.setBasedir(new File(getProject().getBaseDir(), "tmp")); > ds.setIncludes(new String[] {"alpha/beta/gamma/GAMMA.XML"}); > ds.scan(); > - compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"}, > - new String[] {}); > + if (Os.isFamily("dos")) { > + compareFiles(ds, new String[] {"alpha/beta/gamma/GAMMA.XML"}, > + new String[] {}); > + } else { > + compareFiles(ds, new String[] {"alpha/beta/gamma/gamma.xml"}, > + new String[] {}); > + } > } > > public void test2ButCaseInsesitive() { > @@ -139,9 +148,15 @@ > ds.setIncludes(new String[] {"ALPHA/"}); > ds.setCaseSensitive(false); > ds.scan(); > - compareFiles(ds, new String[] {"alpha/beta/beta.xml", > + if (Os.isFamily("dos")) { > + compareFiles(ds, new String[] {"ALPHA/beta/beta.xml", > + "ALPHA/beta/gamma/gamma.xml"}, > + new String[] {"ALPHA", "ALPHA/beta", "ALPHA/beta/gamma"}); > + } else { > + compareFiles(ds, new String[] {"alpha/beta/beta.xml", > "alpha/beta/gamma/gamma.xml"}, > new String[] {"alpha", "alpha/beta", "alpha/beta/gamma"}); > + } > } > > public void testAllowSymlinks() { > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org > For additional commands, e-mail: dev-help@ant.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org