You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ddlutils-dev@db.apache.org by mv...@apache.org on 2006/01/03 20:12:54 UTC
svn commit: r365715 - in /db/ddlutils/trunk: build.properties build.xml
Author: mvdb
Date: Tue Jan 3 11:12:50 2006
New Revision: 365715
URL: http://svn.apache.org/viewcvs?rev=365715&view=rev
Log:
Tweak the build a little bit. Excluding 2 abstract test cases and start using profiles with (for now) junit-axiondb. Will try to generalize things later.
Modified:
db/ddlutils/trunk/build.properties
db/ddlutils/trunk/build.xml
Modified: db/ddlutils/trunk/build.properties
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/build.properties?rev=365715&r1=365714&r2=365715&view=diff
==============================================================================
--- db/ddlutils/trunk/build.properties (original)
+++ db/ddlutils/trunk/build.properties Tue Jan 3 11:12:50 2006
@@ -39,6 +39,8 @@
checkstyle.author.pattern=\\S
checkstyle.license.file=${src.check.dir}/license-check.txt
+
+test.profile.directory=src/test-profiles
#
# Documentation properties
#
Modified: db/ddlutils/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/build.xml?rev=365715&r1=365714&r2=365715&view=diff
==============================================================================
--- db/ddlutils/trunk/build.xml (original)
+++ db/ddlutils/trunk/build.xml Tue Jan 3 11:12:50 2006
@@ -227,7 +227,14 @@
<!-- ================================================================== -->
<target name="junit-axion"
description="Runs the test cases against axion">
- <property name="jdbc.properties.file" value="/jdbc.properties.axion"/>
+ <condition property="jdbc.properties.file" value="${test.profile.directory}/${profile}/jdbc.properties.axion">
+ <isset property="profile"/>
+ </condition>
+ <condition property="jdbc.properties.file" value="/jdbc.properties.axion">
+ <not>
+ <isset property="jdbc.properties.file"/>
+ </not>
+ </condition>
<antcall target="-junit-internal"/>
</target>
@@ -251,8 +258,10 @@
<formatter type="plain"/>
<classpath refid="compilation-classpath"/>
<batchtest todir="${build.test.dir}">
- <fileset dir="${src.test.dir}"
- includes="**/Test*.java"/>
+ <fileset dir="${src.test.dir}" includes="**/Test*.java">
+ <exclude name="**/TestDatabaseWriterBase.java"/>
+ <exclude name="**/TestPlatformBase.java"/>
+ </fileset>
</batchtest>
</junit>
</target>
Re: svn commit: r365715 - in /db/ddlutils/trunk: build.properties
build.xml
Posted by Martin van den Bemt <ml...@mvdb.net>.
Forgot to mention that in the commit : the old stuff still works, so you don't have to specify
-Dprofile=xxx on the commandline..
Will try to get around to making this better, but first I have to fix mysql integration, so
everything will be back in a working state at work.
Mvgr,
Martin
mvdb@apache.org wrote:
> Modified: db/ddlutils/trunk/build.xml
> URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/build.xml?rev=365715&r1=365714&r2=365715&view=diff
> ==============================================================================
> --- db/ddlutils/trunk/build.xml (original)
> +++ db/ddlutils/trunk/build.xml Tue Jan 3 11:12:50 2006
> @@ -227,7 +227,14 @@
> <!-- ================================================================== -->
> <target name="junit-axion"
> description="Runs the test cases against axion">
> - <property name="jdbc.properties.file" value="/jdbc.properties.axion"/>
> + <condition property="jdbc.properties.file" value="${test.profile.directory}/${profile}/jdbc.properties.axion">
> + <isset property="profile"/>
> + </condition>
> + <condition property="jdbc.properties.file" value="/jdbc.properties.axion">
> + <not>
> + <isset property="jdbc.properties.file"/>
> + </not>
> + </condition>
> <antcall target="-junit-internal"/>
> </target>
>
> @@ -251,8 +258,10 @@
> <formatter type="plain"/>
> <classpath refid="compilation-classpath"/>
> <batchtest todir="${build.test.dir}">
> - <fileset dir="${src.test.dir}"
> - includes="**/Test*.java"/>
> + <fileset dir="${src.test.dir}" includes="**/Test*.java">
> + <exclude name="**/TestDatabaseWriterBase.java"/>
> + <exclude name="**/TestPlatformBase.java"/>
> + </fileset>
> </batchtest>
> </junit>
> </target>
>
>
>
>