stevel 02/04/11 16:35:46
Modified: . build.xml
Log:
dont run the .net tests unless CSC and WSDL are found
Revision Changes Path
1.287 +27 -5 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- build.xml 8 Apr 2002 14:25:18 -0000 1.286
+++ build.xml 11 Apr 2002 23:35:45 -0000 1.287
@@ -15,6 +15,8 @@
(and without typing -D each time it compiles it) -->
<property file=".ant.properties" />
<property file="${user.home}/.ant.properties" />
+ <property environment="env" />
+
<property name="Name" value="Apache Ant"/>
<property name="name" value="ant"/>
@@ -447,6 +449,29 @@
<available property="swing.present"
classname="javax.swing.ImageIcon"
classpathref="classpath"/>
+
+ <condition property="wsdl.found">
+ <or>
+ <available file="wsdl" filepath="${env.PATH}" />
+ <available file="wsdl.exe" filepath="${env.PATH}" />
+ <available file="wsdl.exe" filepath="${env.Path}" />
+ </or>
+ </condition>
+ <echo> wsdl.found=${wsdl.found}</echo>
+ <condition property="csc.found">
+ <or>
+ <available file="csc" filepath="${env.PATH}" />
+ <available file="csc.exe" filepath="${env.PATH}" />
+ <available file="csc.exe" filepath="${env.Path}" />
+ </or>
+ </condition>
+ <echo> csc.found=${csc.found}</echo>
+ <condition property="dotnetapps.found">
+ <and>
+ <isset property="csc.found"/>
+ <isset property="wsdl.found"/>
+ </and>
+ </condition>
</target>
@@ -1244,11 +1269,8 @@
unless="tests.and.ant.share.classloader" />
<exclude name="${optional.package}/metamata/MAuditParserTest.java"
unless="tests.and.ant.share.classloader" />
-
- <!-- failure of this test case kills the current JVM
- so until the defect is actually fixed it is taken
- out of the test list -->
- <exclude name="${ant.package}/taskdefs/JavaTest.java" />
+ <exclude name="${optional.package}/WsdlToDotnetTest.java"
+ unless="dotnetapps.found" />
<!-- can only run if cvs is installed on your machine
enable by setting the property have.cvs
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
