Browse Source

dont run the .net tests unless CSC and WSDL are found

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272388 13f79535-47bb-0310-9956-ffa450edef68
master
Steve Loughran 23 years ago
parent
commit
c31017e566
1 changed files with 27 additions and 5 deletions
  1. +27
    -5
      build.xml

+ 27
- 5
build.xml View File

@@ -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


Loading…
Cancel
Save