You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2005/11/16 23:14:34 UTC
svn commit: r345137 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility:
oneCombo.properties testScript.xml
Author: davidvc
Date: Wed Nov 16 14:14:27 2005
New Revision: 345137
URL: http://svn.apache.org/viewcvs?rev=345137&view=rev
Log:
Another modification for DERBY-689, contributed by Rick Hillegas
<quote>
further improves this suite by adding a target for running just one
combination of client/clientVM/server/serverVM. The target is called
oneCombination and it is explained by -projecthelp.
</quote>
Builds fine and the CompatibilityTest.java runs fine.
David
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/oneCombo.properties (with props)
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/oneCombo.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/oneCombo.properties?rev=345137&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/oneCombo.properties (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/oneCombo.properties Wed Nov 16 14:14:27 2005
@@ -0,0 +1,9 @@
+--
+-- Sample properties file to use with the oneCombination
+-- target of the compatibility suite. Copy this template
+-- and customize it to reflect the combination you need.
+--
+serverVM=${VM_1.4}
+serverClasspath=${SERVER_10.1.2.0}
+clientVM=${VM_1.3}
+clientClasspath=${CLIENT_10.1.1.0}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/oneCombo.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml?rev=345137&r1=345136&r2=345137&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/testScript.xml Wed Nov 16 14:14:27 2005
@@ -68,6 +68,13 @@
}
Note that the test exits as soon as one combination fails.
+
+ To run just one combination, copy the oneCombo.properties template
+ file from this suite and customize it. Then invoke the oneCombination
+ target:
+
+ ant -buildfile testScript.xml -DoutDir=OUTPUT_DIRECTORY -DoneComboProps=FILE_YOU_JUST_CUSTOMIZED -Ddrb.tests.debug=true oneCombination
+
</description>
<property file="${user.home}/ant.properties"/>
@@ -77,15 +84,18 @@
<property name="summaryFile" value="${outDir}/SUMMARY_COMPAT.txt"/>
<property name="databaseName" value="compatDB"/>
+ <!-- legal values of serverVM and clientVM -->
<property name="VM_1.3" value="${j13lib}/../bin/java"/>
<property name="VM_1.4" value="${j14lib}/../bin/java"/>
<property name="VM_1.5" value="${jdk15}/bin/java"/>
+ <!-- legal values of serverClasspath -->
<property name="SERVER_10.0.2.1" value="${10.0.2.1_lib}/derby.jar;${10.0.2.1_lib}/derbynet.jar"/>
<property name="SERVER_10.1.1.0" value="${10.1.1.0_lib}/derby.jar;${10.1.1.0_lib}/derbynet.jar"/>
<property name="SERVER_10.1.2.0" value="${10.1.2.0_lib}/derby.jar;${10.1.2.0_lib}/derbynet.jar"/>
<property name="SERVER_TRUNK" value="${trunk_lib}/derby.jar;${trunk_lib}/derbynet.jar"/>
+ <!-- legal values of clientClasspath -->
<property name="CLIENT_DB2JCC" value="${db2jcc_lib}/db2jcc.jar;${db2jcc_lib}/db2jcc_license_c.jar"/>
<property name="CLIENT_10.1.1.0" value="${10.1.1.0_lib}/derbyclient.jar"/>
<property name="CLIENT_10.1.2.0" value="${10.1.2.0_lib}/derbyclient.jar"/>
@@ -104,6 +114,12 @@
<!-- May be overridden on the command line -->
<property name="drb.tests.debug" value="false"/>
+ <!--
+ If this file exists, it sets up properties for oneCombination.
+ The property file is passed in on the command line.
+ -->
+ <property file="${oneComboProps}"/>
+
<!--
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!
@@ -161,14 +177,26 @@
</target>
+ <!--
+ Run tests against one combination. The combination is
+ determined by the following variables, which are set
+ in the properties file identified on the command line by
+ the -DoneComboProps flag:
+
+ serverVM VM to run server in
+ serverClasspath Classpath containing server jars
+ clientVM VM to run client in
+ clientClasspath Classpath containing client jars
+ -->
<target
- name="jdbcTrunk"
- depends="cleanup"
- description="Run compatibility tests against the latest client/server. This is a debugging entry point which gives developers a quick sanity test of one combination."
+ name="oneCombination"
+ description="Run compatibility tests one combination."
>
+ <antcall target="_stopServer"/>
+
<antcall target="_startServer">
- <param name="svrVM" value="${VM_DEFAULT}"/>
- <param name="srvClasspath" value="${SERVER_TRUNK}"/>
+ <param name="svrVM" value="${serverVM}"/>
+ <param name="srvClasspath" value="${serverClasspath}"/>
</antcall>
<antcall target="_recreateDatabase"/>
@@ -176,9 +204,9 @@
<antcall target="_oneTest">
<param name="otTestName" value="${JDBC_SUITE}"/>
- <param name="otClasspath" value="${CLIENT_TRUNK}"/>
- <param name="otOutfile" value="trunk_trunk"/>
- <param name="otVM" value="${VM_DEFAULT}"/>
+ <param name="otClasspath" value="${clientClasspath}"/>
+ <param name="otOutfile" value="oneCombination"/>
+ <param name="otVM" value="${clientVM}"/>
<param name="otClientName" value=""/>
</antcall>