Merge branch '1.9.x'

build.xml

@@ -1962,6 +1962,7 @@ ${antunit.reports}
       <propertyset>
         <propertyref name="antunit.tmpdir"/>
         <propertyref name="ant.home"/>
+        <propertyref name="jenkins"/>
       </propertyset>
     </au:antunit>
   </target>

launch-build.xml

@@ -21,7 +21,11 @@
         Build file be able to launch the boostrap build of Ant on every supported platform
     </description>
     
-    <property name="args" value="allclean test -Dignore.tests.failed=true -Doptional.jars.whenmanifestonly=skip" />
+    <property name="default-args" value="allclean test -Dignore.tests.failed=true -Doptional.jars.whenmanifestonly=skip" />
+    <condition property="args" value="${default-args} -Djenkins=t">
+      <isset property="jenkins"/>
+    </condition>
+    <property name="args" value="${default-args}" />
 
     <condition property="launch.cmd" value="${basedir}/build.sh">
         <os family="unix" />

src/tests/antunit/taskdefs/get-test.xml

@@ -94,7 +94,7 @@
     </target>
     
     
-    <target name="testInfiniteRedirect">
+    <target name="testInfiniteRedirect" unless="jenkins">
         <au:expectfailure expectedmessage="More than 25 times redirected, giving up">
       <get  src="${location}/infinite.txt" dest="${output}/infinite.tmp"/>
         </au:expectfailure>