Author: linus
Date: 2008-07-19 10:04:43-0700
New Revision: 15309
Modified:
trunk/build.xml
trunk/src/argouml-build/build.xml
trunk/src/argouml-core-model-mdr/build.xml
Log:
Fixed so that it is possible to run the guitests and alltests from the top
and from argouml-build.
Modified: trunk/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/build.xml?view=diff&rev=15309&p1=trunk/build.xml&p2=trunk/build.xml&r1=15308&r2=15309
==============================================================================
--- trunk/build.xml (original)
+++ trunk/build.xml 2008-07-19 10:04:43-0700
@@ -34,7 +34,7 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the jar file -->
+ <!-- Creates the jar files -->
<!-- =================================================================== -->
<target name="jar" depends="init"
description="Build and copies files.">
@@ -91,6 +91,28 @@
</delete>
</target>
+
+
+ <!-- =================================================================== -->
+ <!-- Targets for tests -->
+ <!-- =================================================================== -->
+ <target name="tests"
+ description="Run normal tests.">
+ <ant dir="src/argouml-build" inheritAll="false" target="tests"/>
+ </target>
+
+ <target name="guitests"
+ description="Run the GUI tests.">
+ <ant dir="src/argouml-build" inheritAll="false" target="guitests"/>
+ </target>
+
+ <target name="alltests"
+ description="Run all tests.">
+ <ant dir="src/argouml-build" inheritAll="false" target="alltests"/>
+ </target>
+
+
+
<!-- =================================================================== -->
<!-- Clean targets -->
<!-- =================================================================== -->
Modified: trunk/src/argouml-build/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=15309&p1=trunk/src/argouml-build/build.xml&p2=trunk/src/argouml-build/build.xml&r1=15308&r2=15309
==============================================================================
--- trunk/src/argouml-build/build.xml (original)
+++ trunk/src/argouml-build/build.xml 2008-07-19 10:04:43-0700
@@ -316,8 +316,7 @@
<!-- Run tests in all subdirectories. -->
<!-- Order is important. -->
<!-- =================================================================== -->
- <target name="tests"
- description="Run tests.">
+ <target name="tests-run-them-all">
<!-- Build the subdirs in order. -->
@@ -327,15 +326,20 @@
<!-- Tests for model-mdr -->
<ant dir="../argouml-core-infra" inheritAll="false" target="jar"/>
<ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
- <ant dir="../argouml-core-model-mdr" inheritAll="false" target="tests"/>
+ <ant dir="../argouml-core-model-mdr" inheritAll="false"
+ target="${tests-to-do}"/>
-<!-- <ant dir="model-euml" inheritAll="false" target="tests"/> -->
+ <!-- model-euml is not included in this run.
+ <ant dir="model-euml" inheritAll="false"
+ target="${tests-to-do}"/>
+ -->
<!-- Tests for argouml-app -->
<ant dir="../argouml-core-infra" inheritAll="false" target="jar"/>
<ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
<ant dir="../argouml-core-model-mdr" inheritAll="false" target="jar"/>
- <ant dir="../argouml-app" inheritAll="false" target="tests"/>
+ <ant dir="../argouml-app" inheritAll="false"
+ target="${tests-to-do}"/>
<!-- Tests for sequence2 -->
<!--
@@ -343,7 +347,8 @@
<ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
<ant dir="../argouml-core-model-mdr" inheritAll="false" target="jar"/>
<ant dir="../argouml-app" inheritAll="false" target="jar"/>
- <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false" target="tests"/>
+ <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false"
+ target="${tests-to-do}"/>
-->
<antcall target="tests-reports"/>
@@ -379,6 +384,28 @@
</target>
+ <target name="tests"
+ description="Run tests in all subsystems.">
+ <antcall target="tests-run-them-all">
+ <param name="tests-to-do" value="tests"/>
+ </antcall>
+ </target>
+
+ <target name="guitests"
+ description="Run GUI tests in all subsystems.">
+ <antcall target="tests-run-them-all">
+ <param name="tests-to-do" value="guitests"/>
+ </antcall>
+ </target>
+
+ <target name="alltests"
+ description="Run all tests in all subsystems.">
+ <antcall target="tests-run-them-all">
+ <param name="tests-to-do" value="alltests"/>
+ </antcall>
+ </target>
+
+
<!-- =================================================================== -->
<!-- Clean all subdirectories. -->
<!-- =================================================================== -->
Modified: trunk/src/argouml-core-model-mdr/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/build.xml?view=diff&rev=15309&p1=trunk/src/argouml-core-model-mdr/build.xml&p2=trunk/src/argouml-core-model-mdr/build.xml&r1=15308&r2=15309
==============================================================================
--- trunk/src/argouml-core-model-mdr/build.xml (original)
+++ trunk/src/argouml-core-model-mdr/build.xml 2008-07-19 10:04:43-0700
@@ -366,6 +366,12 @@
<antcall target="junit-report-create"/>
</target>
+ <target name="guitests">
+ <echo message="No guitests exists for argouml-core-model-mdr."/>
+ </target>
+
+ <target name="alltests" depends="tests"/>
+
<!-- =================================================================== -->
<!-- Clean targets -->
<!-- =================================================================== -->
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.