From 90cc26a37ac49a3685a2f12ba34021b252529511 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Wed, 20 Sep 2006 05:10:29 +0000
Subject: [PATCH] make sure that most of DirectoryScannerTest runs when we
 build a release. This one is too critical.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@448068 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                            |  2 --
 .../org/apache/tools/ant/DirectoryScannerTest.java   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index e0dd8c6ba..7f67ea0ac 100644
--- a/build.xml
+++ b/build.xml
@@ -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"
diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
index 2e2a916b8..9c69618d2 100644
--- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
+++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
@@ -401,6 +401,18 @@ public class DirectoryScannerTest extends BuildFileTest {
     }
 
     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"));