You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ha...@apache.org on 2005/06/08 14:53:06 UTC
cvs commit: ws-axis/c/build buildMonitor.xml
hawkeye 2005/06/08 05:53:06
Modified: c test.xml
c/build buildMonitor.xml
Log:
Altered the test-suite so that the monitor now gets built into the obj directory
Revision Changes Path
1.30 +19 -1 ws-axis/c/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/test.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- test.xml 7 Apr 2005 15:34:38 -0000 1.29
+++ test.xml 8 Jun 2005 12:53:06 -0000 1.30
@@ -14,12 +14,29 @@
<!--
Default target that set all the required framework to build, run and report on the tests
-->
- <target name="testSuite" depends="preInitializeTest, overrideTest, initialize, initializeTest, compileMonitorUtility, initializeLogFile, runTests, displayAllResults"
+ <target name="testSuite" depends="preInitializeTest, overrideTest, initialize, initializeTest, compileMonitorUtility, moveMonitorJar, initializeLogFile, runTests, displayAllResults"
description="Build and Run all tests"/>
<target name="preInitializeTest" depends="pre-init">
<property file="${dir.properties}/test.${platform}.properties" />
</target>
+
+
+ <target name="moveMonitorJar" depends="initialize, compileMonitorUtility">
+ <description>
+ The monitor utility is built in its source directory. This is not good as when you do a cvs update this always comes back as a
+ difference. So, as the monitor is only built when a test is run, this is the right place to move it from there to the
+ obj directory so it does not interfere with the cvs update process.
+ </description>
+ <move todir="${dir.obj}/test/monitor">
+ <fileset dir="${basedir}/tests/utils/monitor">
+ <include name="**/*.class"/>
+ <include name="*.jar"/>
+ </fileset>
+ </move>
+ </target>
+
+
<!--
Loop through all the test xml properties files in the tests
@@ -101,6 +118,7 @@
<property name="test.directory" value="${dir.test.generated}/${client.lang}/${testName}"/>
<property name="expected.file" value="${test.directory}/${testName}.expected"/>
<property name="r_expected.file" value="${test.directory}/${testName}Request.expected"/>
+ <property name="response_expected.file" value="${test.directory}/${testName}ServerResponse.expected"/>
<property name="results.stdout" value="${test.directory}/${testName}.out"/>
<property name="results.stderr" value="${test.directory}/${testName}.err"/>
</target>
1.2 +1 -0 ws-axis/c/build/buildMonitor.xml
Index: buildMonitor.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildMonitor.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildMonitor.xml 11 Dec 2004 15:26:14 -0000 1.1
+++ buildMonitor.xml 8 Jun 2005 12:53:06 -0000 1.2
@@ -2,6 +2,7 @@
<project name="buildMonitor" default="compileMonitorUtility" basedir="..">
<target name="compileMonitorUtility" unless="monitor.compiled">
+ <!-- run build.xml in the monitor directory -->
<ant dir="${basedir}/tests/utils/monitor" target="production"/>
<property name="monitor.compiled" value="true"/>
</target>