Return-Path: 
 <axis-cvs-return-2690-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 46152 invoked from network); 8 Sep 2004 12:46:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 8 Sep 2004 12:46:39 -0000
Received: (qmail 57884 invoked by uid 500); 8 Sep 2004 12:45:13 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 57487 invoked by uid 500); 8 Sep 2004 12:45:08 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
list-post: <mailto:axis-cvs@ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 57457 invoked by uid 99); 8 Sep 2004 12:45:07 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 08 Sep 2004 05:45:04 -0700
Received: (qmail 44845 invoked by uid 1876); 8 Sep 2004 12:45:01 -0000
Date: 8 Sep 2004 12:45:01 -0000
Message-ID: <20040908124501.44844.qmail@minotaur.apache.org>
From: hawkeye@apache.org
To: ws-axis-cvs@apache.org
Subject: cvs commit: ws-axis/c test.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

hawkeye     2004/09/08 05:45:01

  Modified:    c        test.xml
  Log:
  Accidently over-wrote the description and parallel sections from the previous version. Now merged correctly.
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.5       +41 -33    ws-axis/c/test.xml
  
  Index: test.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/test.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- test.xml	8 Sep 2004 10:37:43 -0000	1.4
  +++ test.xml	8 Sep 2004 12:45:01 -0000	1.5
  @@ -1,14 +1,17 @@
   <project name="AxisCTests" default="testSuite" basedir=".">
  -<description>
  -This ANT script generates, compiles and runs the client stub tests for Apache.
  +<description >
  +This ANT script generates, compiles, runs and validates the client stub tests
  +for Apache.
   
   This script is intended for use with Java 1.4+ and Apache ANT 1.6+.
   Ant is available from: http://ant.apache.org/
   
  -To compile C/C++ code you will require the cpptasks extension to ANT, within:
  +To allow the automated finding of all available tests, use has been made of the
  +ant-contrib project offering.  Also, to compile C/C++ code you will require the
  +cpptasks extension to ANT. You will need to place the JAR files within:
   	[ant install dir]/lib
  -This is available from: http://ant-contrib.sourceforge.net/
  -{Note: you will require the cpptasks download, not ant-contrib}
  +These are available from: http://ant-contrib.sourceforge.net/
  +{Note: The cpptasks are a seperate download from ant-contrib}
   
   It is intended that the default target be used, which compiles and links all code,
   generates documentation and packages ready for distribution.
  @@ -409,34 +412,39 @@
   		<property name="expected.file" value="${dir.src}/output/${testName}.out"/>
   		<property name="r_expected.file" value="${dir.src}/output/${testName}Request.out"/>
   
  -		<parallel timeout="30000">
  -			<!-- Run Monitor utility to allow validation of message across the wire -->
  -			<java classname="org.apache.test.TCPMonitor">
  -				<arg line="-l 13262"/>
  -				<arg line="-p ${testPort}"/>
  -				<arg line="-h ${testHost}"/>
  -				<arg line="-o ${dir.test.generated}/${client.lang}/${testName}/tcpm.out"/>
  -				<classpath>
  -					<pathelement location="${basedir}/tests/utils/monitor/monitor.jar"/>
  -				</classpath>
  -			</java>
  -
  -			<sequential>
  -				<!-- Wait for jvm to start monitor program -->
  -				<sleep seconds="5"/>
  -				<!-- Run the client test -->
  -				<exec executable="${dir.test.generated}/${client.lang}/${testName}/${testName}"
  -				 dir="${dir.test.generated}/${client.lang}/${testName}" output="${results.file}"
  -				 error="${dir.test.generated}/${client.lang}/${testName}/${testName}.err"
  -				 failifexecutionfails="false" vmlauncher="false">
  -					<arg line="-p 13262"/>
  -					<arg line="-s localhost"/>
  -					<env key="PATH" value="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}/bin"/>
  -					<env key="LD_LIBRARY_PATH" value="${dir.libraries}${path.separator}${dir.xmlParser}/lib"/>
  -					<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}"/>
  -				</exec>
  -			</sequential>
  -		</parallel>
  +		<trycatch>
  +			<try>
  +				<parallel timeout="120000">
  +					<!-- Run Monitor utility to allow validation of message across the wire -->
  +					<java classname="org.apache.test.TCPMonitor">
  +						<arg line="-l ${monitorPort}"/>
  +						<arg line="-p ${testPort}"/>
  +						<arg line="-h ${testHost}"/>
  +						<arg line="-o ${dir.test.generated}/${testName}/tcpm.out"/>
  +						<classpath>
  +							<pathelement location="${basedir}/tests/utils/monitor/monitor.jar"/>
  +						</classpath>
  +					</java>
  +		
  +					<sequential>
  +						<!-- Wait for jvm to start monitor program -->
  +						<sleep seconds="5"/>
  +						<!-- Run the client test -->
  +						<exec executable="${dir.test.generated}/${testName}/${testName}"
  +						 dir="${dir.test.generated}/${testName}" output="${results.file}"
  +						 error="${dir.test.generated}/${testName}/${testName}.err"
  +						 failifexecutionfails="false" vmlauncher="false">
  +							<arg line="-p ${monitorPort}"/>
  +							<arg line="-s localhost"/>
  +							<env key="PATH" value="${java.library.path}${path.separator}${dir.libraries}${path.separator}${dir.xmlParser}/bin"/>
  +							<env key="LD_LIBRARY_PATH" value="${dir.libraries}${path.separator}${dir.xmlParser}/lib"/>
  +							<env key="AXISCPP_DEPLOY" value="${axiscpp_deploy}"/>
  +						</exec>
  +					</sequential>
  +				</parallel>
  +			</try>
  +			<catch/>
  +		</trycatch>
   	</target>
   	
   	<!--