From 5ed62726c6d631b9b70dd2cec27c852c7940345b Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 20 Feb 2002 08:57:59 +0000
Subject: [PATCH] exclude JUnitClassloaderTest if the test classes can be
 loaded from the system classloader.

I'm afraid I didn't beat the nightly GUMP run, expect a nag mail 8-)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271445 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build.xml b/build.xml
index 6135d4f73..2542eddbd 100644
--- a/build.xml
+++ b/build.xml
@@ -241,6 +241,18 @@
     </condition>
 
     <available property="base64.present" classname="sun.misc.BASE64Encoder" />
+
+    <property name="build.tests.resolved" location="${build.tests}" />
+    <condition property="tests.are.on.system.classpath">
+      <or>
+        <!-- relative paths in CLASSPATH -->
+        <contains string="${java.class.path}"
+                  substring="${build.tests}" />
+        <!-- absolute paths in CLASSPATH -->
+        <contains string="${java.class.path}"
+                  substring="${build.tests.resolved}" />
+      </or>
+    </condition>
   </target>
 
   <!--
@@ -1000,6 +1012,9 @@
           <!-- uses the context classloader -->
           <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
                    unless="jdk1.2+"/>
+          <!-- fails if testcases can be loaded from the system classloader -->
+          <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
+                   if="tests.are.on.system.classpath"/>
 
           <exclude name="${optional.package}/perforce/*.java"
                    unless="jakarta.oro.present" />