From dev-return-74958-apmail-ant-dev-archive=ant.apache.org@ant.apache.org Wed Sep 20 05:10:38 2006
Return-Path: <dev-return-74958-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 84048 invoked from network); 20 Sep 2006 05:10:37 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 20 Sep 2006 05:10:37 -0000
Received: (qmail 63616 invoked by uid 500); 20 Sep 2006 05:10:35 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 63300 invoked by uid 500); 20 Sep 2006 05:10:33 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 63274 invoked by uid 500); 20 Sep 2006 05:10:33 -0000
Received: (qmail 63267 invoked by uid 99); 20 Sep 2006 05:10:32 -0000
Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Sep 2006 22:10:32 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME
Received: from ([140.211.166.113:62080] helo=eris.apache.org)
	by idunn.apache.osuosl.org (ecelerity 2.1 r(10620)) with ESMTP
	id 51/71-01184-84DC0154 for <ant-cvs@apache.org>; Tue, 19 Sep 2006 22:10:32 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6CF7A1A981A; Tue, 19 Sep 2006 22:10:30 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r448068 - in /ant/core/trunk: build.xml
 src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
Date: Wed, 20 Sep 2006 05:10:30 -0000
To: ant-cvs@apache.org
From: antoine@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060920051030.6CF7A1A981A@eris.apache.org>
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: antoine
Date: Tue Sep 19 22:10:29 2006
New Revision: 448068

URL: http://svn.apache.org/viewvc?view=rev&rev=448068
Log:
make sure that most of DirectoryScannerTest runs when we build a release.
This one is too critical.

Modified:
    ant/core/trunk/build.xml
    ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?view=diff&rev=448068&r1=448067&r2=448068
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Tue Sep 19 22:10:29 2006
@@ -1698,8 +1698,6 @@
           <!--  These tests only passes if testcases and Ant classes have
           been loaded by the same classloader - will throw
           IllegalAccessExceptions otherwise.  -->
-          <exclude name="${ant.package}/DirectoryScannerTest.java"
-            unless="tests.and.ant.share.classloader"/>
           <exclude name="${taskdefs.package}/SQLExecTest.java"
             unless="tests.and.ant.share.classloader"/>
           <exclude name="${taskdefs.package}/cvslib/ChangeLogWriterTest.java"

Modified: ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java?view=diff&rev=448068&r1=448067&r2=448068
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java (original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java Tue Sep 19 22:10:29 2006
@@ -401,6 +401,18 @@
     }
 
     public void testIsExcludedDirectoryScanned() {
+        String shareclassloader = getProject().getProperty("tests.and.ant.share.classloader");
+        // when the test is started by the build.xml of ant
+        // if the property tests.and.ant.share.classloader is not set in the build.xml
+        // a sysproperty with name tests.and.ant.share.classloader and value
+        // ${tests.and.ant.share.classloader} will be set
+        // we are trying to catch this here.
+        if (shareclassloader == null
+                || (shareclassloader != null && shareclassloader.indexOf("${") == 0)) {
+            System.out.println("cannot execute testIsExcludedDirectoryScanned when tests are forked, " +
+                    "package private method called");
+            return;
+        }
         getProject().executeTarget("children-of-excluded-dir-setup");
         DirectoryScanner ds = new DirectoryScanner();
         ds.setBasedir(new File(getProject().getBaseDir(), "tmp"));



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