You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pe...@apache.org on 2005/04/04 17:42:26 UTC
cvs commit: ws-axis/c test.xml
perryan 2005/04/04 08:42:26
Modified: c/build buildInitialize.xml
c test.xml
Added: c/build Initialize.xml test.properties testOverride.xml
Log:
Allow the build properties to be overridden for test by using an overriding test properties file.
properties in test.properties will be used to override the properties in the build.properties file.
as a result of the order the properties are read in the properties need to be copied with propertycopy to override certain properties.
by default no properties are set so no changes are required by anyone, but these changes allow for the properties to be overridden
so the testing can be done after the build and packaging step and the testing done against only the packaged deliverable and not reference any items in the build tree.
Revision Changes Path
1.11 +4 -41 ws-axis/c/build/buildInitialize.xml
Index: buildInitialize.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildInitialize.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildInitialize.xml 16 Mar 2005 16:50:45 -0000 1.10
+++ buildInitialize.xml 4 Apr 2005 15:42:26 -0000 1.11
@@ -21,10 +21,10 @@
<property name="dir.properties" value="${basedir}/build"/>
- <property environment="env"/>
-
-
+ <!-- platform specific stuff separated -->
+ <import file="${basedir}/build/Initialize.xml"/>
+ <property environment="env"/>
<!--
Compiler Definitions
@@ -172,25 +172,8 @@
</linker>
<!--
- Determine platform
+ pre-init target is now in Initialize.xml
-->
- <target name="pre-init">
- <condition property="solaris">
- <os name="SunOS"/>
- </condition>
- <condition property="windows">
- <os family="windows"/>
- </condition>
- <condition property="aix">
- <os name="AIX"/>
- </condition>
- <condition property="linux">
- <os name="Linux"/>
- </condition>
- <condition property="os400">
- <os name="OS/400"/>
- </condition>
- </target>
<!--
Initialize properties
@@ -199,26 +182,6 @@
<target name="initialize" depends="set-platform-specifics, checkIfDebug" />
<target name="set-platform-specifics" depends="pre-init">
- <condition property="platform" value="SunOS">
- <isset property="solaris"/>
- </condition>
- <condition property="platform" value="Win32">
- <isset property="windows"/>
- </condition>
- <condition property="platform" value="Linux">
- <isset property="linux"/>
- </condition>
- <condition property="platform" value="AIX">
- <isset property="aix"/>
- </condition>
- <condition property="platform" value="OS400">
- <isset property="os400"/>
- </condition>
-
- <!--
- Load versioning information from version.properties
- -->
- <property file="${dir.properties}/version.properties"/>
<!-- Load properties from file -->
<property file="${dir.properties}/build.${platform}.properties"/>
1.1 ws-axis/c/build/Initialize.xml
Index: Initialize.xml
===================================================================
<project name="Initialize" default="pre-init">
<!--
Determine platform
-->
<target name="pre-init">
<condition property="solaris">
<os name="SunOS"/>
</condition>
<condition property="windows">
<os family="windows"/>
</condition>
<condition property="aix">
<os name="AIX"/>
</condition>
<condition property="linux">
<os name="Linux"/>
</condition>
<condition property="os400">
<os name="OS/400"/>
</condition>
<condition property="platform" value="SunOS">
<isset property="solaris"/>
</condition>
<condition property="platform" value="Win32">
<isset property="windows"/>
</condition>
<condition property="platform" value="Linux">
<isset property="linux"/>
</condition>
<condition property="platform" value="AIX">
<isset property="aix"/>
</condition>
<condition property="platform" value="OS400">
<isset property="os400"/>
</condition>
<!--
Load versioning information from version.properties
-->
<property file="${dir.properties}/version.properties"/>
</target>
</project>
1.1 ws-axis/c/build/test.properties
Index: test.properties
===================================================================
# This file gets loaded before build.platform.properties (for test only)
# Therefore it cannot rely on properties set in build.platform.properties
# Location of the installed package, i.e. parent of delivered lib files
#dir.release=${basedir}/../../../obj/package/axis-c-${version}-${platform}-trace-bin
# Specify to use the delivered include files
#test.include=${dir.release}/include
# Location of the AXIS jar files - same as build properties
#test.axisJARs=${env.AXISJAVA_LIB}
# Location of the XML Parser library files (include lib/bin in name)
#test.xmlParser=${env.XERCES_HOME}/lib
1.1 ws-axis/c/build/testOverride.xml
Index: testOverride.xml
===================================================================
<project name="test_properties" default="overrideTest" basedir="..">
<target name="overrideTest">
<if>
<isset property="test.include"/>
<then>
<propertycopy property="dir.include" from="test.include" override="true" silent="true"/>
</then>
</if>
<if>
<isset property="test.axisJARs"/>
<then>
<propertycopy property="dir.axisJARs" from="test.axisJARs" override="true" silent="true"/>
</then>
</if>
<if>
<isset property="test.xmlParser"/>
<then>
<propertycopy property="dir.xmlParser" from="test.xmlParser" override="true" silent="true"/>
</then>
</if>
</target>
</project>
1.27 +6 -1 ws-axis/c/test.xml
Index: test.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/test.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- test.xml 17 Feb 2005 19:36:22 -0000 1.26
+++ test.xml 4 Apr 2005 15:42:26 -0000 1.27
@@ -1,6 +1,7 @@
<project name="test" default="testSuite">
<import file="${basedir}/build/buildInitialize.xml"/>
+ <import file="${basedir}/build/testOverride.xml"/>
<import file="${basedir}/build/testInitialize.xml"/>
<import file="${basedir}/build/buildTest.xml"/>
<import file="${basedir}/build/validateTest.xml"/>
@@ -13,9 +14,13 @@
<!--
Default target that set all the required framework to build, run and report on the tests
-->
- <target name="testSuite" depends="initialize, initializeTest, compileMonitorUtility, initializeLogFile, runTests, displayAllResults"
+ <target name="testSuite" depends="preInitializeTest, overrideTest, initialize, initializeTest, compileMonitorUtility, initializeLogFile, runTests, displayAllResults"
description="Build and Run all tests"/>
+ <target name="preInitializeTest" depends="pre-init">
+ <property file="${dir.properties}/test.properties" />
+ </target>
+
<!--
Loop through all the test xml properties files in the tests
list and call runTest target