hawkeye 2005/06/09 05:45:56
Modified: c/build executeTest.xml
Log:
Resolved problem where ServerResponse file was copied regardless of whether
mockServer=false or true
which led to biuld failing if there was no serverResponse file
Revision Changes Path
1.27 +11 -12 ws-axis/c/build/executeTest.xml
Index: executeTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/executeTest.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- executeTest.xml 8 Jun 2005 15:52:07 -0000 1.26
+++ executeTest.xml 9 Jun 2005 12:45:56 -0000 1.27
@@ -42,18 +42,17 @@
</target>
<!-- Only copy server response file if it exists and we are in unit
test mode (mockServer mode)-->
- <target name="setServerResponse" if="mockServer"
- unless="buildOnly">
- <basename file="${response_expected.file}"
- property="response_expected.file.basename" />
- <copy
-
file="${dir.autotests}/output/${test.expected.serverResponse}"
- tofile="${response_expected.file}"
failonerror="true" />
- <!--
- Convert to OS specific format
- -->
- <fixcrlf srcdir="${test.directory}"
- includes="${response_expected.file.basename}" />
+ <target name="setServerResponse" unless="buildOnly">
+ <if>
+ <equals arg1="${mockServer}" arg2="true" />
+ <then>
+ <basename file="${response_expected.file}"
+
property="response_expected.file.basename" />
+ <copy
+
file="${dir.autotests}/output/${test.expected.serverResponse}"
+ tofile="${response_expected.file}"
failonerror="true" />
+ </then>
+ </if>
</target>
