From 1ffcacd800cb4b90403862ba63323377855822c7 Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Thu, 9 Dec 2010 01:34:54 +0000
Subject: [PATCH] get 100% passing tests under Windows jdk 1.5 - the JRE 1.5 is
 not able to open a jar URL when the jar is in a path containing an
 exclamation mark in the middle

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1043813 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/antunit-base.xml          | 1 +
 src/tests/antunit/taskdefs/secure-input.xml | 1 -
 src/tests/antunit/taskdefs/taskdef-test.xml | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index 7b9ebee05..7a2d7cdce 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -19,6 +19,7 @@
 
   <property name="input" location="${java.io.tmpdir}/testinput"/>
   <property name="output" location="${java.io.tmpdir}/testoutput"/>
+  <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
 
   <target name="tearDown">
     <delete dir="${input}"/>
diff --git a/src/tests/antunit/taskdefs/secure-input.xml b/src/tests/antunit/taskdefs/secure-input.xml
index 9534dabbd..e11606c4e 100644
--- a/src/tests/antunit/taskdefs/secure-input.xml
+++ b/src/tests/antunit/taskdefs/secure-input.xml
@@ -20,7 +20,6 @@
 	<import file="../antunit-base.xml"/>
 	
 	<target name="setUp">
-		<available property="jdk1.6+" classname="java.util.ServiceLoader"/>
 	</target>
 		
 	<target name="test-secure-input" if="jdk1.6+">
diff --git a/src/tests/antunit/taskdefs/taskdef-test.xml b/src/tests/antunit/taskdefs/taskdef-test.xml
index 978d03a14..9c65e997b 100644
--- a/src/tests/antunit/taskdefs/taskdef-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-test.xml
@@ -43,7 +43,7 @@
     <au:assertLogContains text="Hello"/>
   </target>
 
-  <target name="testDirWithPling" depends="setUp"
+  <target name="testDirWithPling" depends="setUp" if="jdk1.6+"
           description="https://issues.apache.org/bugzilla/show_bug.cgi?id=50007">
     <property name="dir" location="${tmpdir}/pl!ng"/>
     <mkdir dir="${dir}"/>