antoine 2003/12/03 14:06:41
Modified: . Tag: ANT_16_BRANCH build.xml
Log:
Merge from HEAD
1) make JarTest pass on Windows, these testcases were failing :
testRecreateWithUpdateNewerFile
testRecreateZipfilesetWithUpdateNewerFile,
the problem is the granularity of time stamps on the FAT
see
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/base/filetime_str.asp
for more information
2) prevent XalanLiaisonTest and XslpLiaisonTest from running in batch
when Xerces1 is not available,
3) fix one of the 3 failing testcases (testSimple) from JDependTest
it was failing due to an overdose of \r in the output coming from
BuildFileTest
Revision Changes Path
No revision
No revision
1.392.2.12 +7 -0 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.11
retrieving revision 1.392.2.12
diff -u -r1.392.2.11 -r1.392.2.12
--- build.xml 3 Dec 2003 13:22:29 -0000 1.392.2.11
+++ build.xml 3 Dec 2003 22:06:41 -0000 1.392.2.12
@@ -555,6 +555,9 @@
<available property="beanshell.present"
classname="bsh.StringUtil"
classpathref="classpath"/>
+ <available property="xerces1.present"
+ classname="org.apache.xerces.framework.XMLParser"
+ classpathref="classpath"/>
<available property="jsch.present"
classname="com.jcraft.jsch.Session"
classpathref="classpath"/>
@@ -1497,6 +1500,10 @@
<!-- needs BSF to work -->
<exclude name="${optional.package}/XalanLiaisonTest.java"
unless="bsf.present"/>
+ <exclude name="${optional.package}/XalanLiaisonTest.java"
+ unless="xerces1.present"/>
+ <exclude name="${optional.package}/XslpLiaisonTest.java"
+ unless="xerces1.present"/>
<!-- needs resolver.jar to work -->
<exclude name="${optional.package}/XmlValidateCatalogTest.java"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
