diff options
author | Sylvestre Ledru <sylvestre.ledru@scilab.org> | 2010-05-19 14:24:40 +0200 |
---|---|---|
committer | Clément DAVID <clement.david@scilab.org> | 2010-05-19 14:43:09 +0200 |
commit | 799acc5c1cd0f61299e99448770c4294aaaaf14a (patch) | |
tree | 63a4d30ade840fa24d78c6d3579d9c706e444660 | |
parent | 78e7f3ce529a4d9f0901b17badac8ce7badbb5a4 (diff) | |
download | scilab-799acc5c1cd0f61299e99448770c4294aaaaf14a.zip scilab-799acc5c1cd0f61299e99448770c4294aaaaf14a.tar.gz |
Add a validate target called by test. By default, it does nothing but it can be used by other modules to launch specific tests (xcos)
Change-Id: Iba898ec79bd24e24cb9050bf04b34f8d90d4188b
-rw-r--r-- | scilab/build.incl.xml | 6 | ||||
-rw-r--r-- | scilab/modules/xcos/build.xml | 13 |
2 files changed, 5 insertions, 14 deletions
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml index ad1d0ed..2775544 100644 --- a/scilab/build.incl.xml +++ b/scilab/build.incl.xml | |||
@@ -158,7 +158,7 @@ | |||
158 | <delete dir="${checkstyle.report.dir}"/> | 158 | <delete dir="${checkstyle.report.dir}"/> |
159 | </target> | 159 | </target> |
160 | 160 | ||
161 | <target name="test" depends="compile-test"> | 161 | <target name="test" depends="compile-test, validate" if="test-present"> |
162 | <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" /> | 162 | <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" /> |
163 | <testng verbose="2" haltonfailure="true"> | 163 | <testng verbose="2" haltonfailure="true"> |
164 | <classpath> | 164 | <classpath> |
@@ -171,6 +171,10 @@ | |||
171 | </testng> | 171 | </testng> |
172 | </target> | 172 | </target> |
173 | 173 | ||
174 | <target name="validate"> | ||
175 | <!-- Empty target to be override by other build.xml --> | ||
176 | </target> | ||
177 | |||
174 | <target name="init"> | 178 | <target name="init"> |
175 | <mkdir dir="${classes.dir}"/> | 179 | <mkdir dir="${classes.dir}"/> |
176 | <mkdir dir="${classes.test.dir}"/> | 180 | <mkdir dir="${classes.test.dir}"/> |
diff --git a/scilab/modules/xcos/build.xml b/scilab/modules/xcos/build.xml index 6681f2a..82b8583 100644 --- a/scilab/modules/xcos/build.xml +++ b/scilab/modules/xcos/build.xml | |||
@@ -36,17 +36,4 @@ | |||
36 | file="etc/palettes.xml" /> | 36 | file="etc/palettes.xml" /> |
37 | </target> | 37 | </target> |
38 | 38 | ||
39 | <!-- Overload the test target dependencies --> | ||
40 | <target name="test" depends="compile-test, validate"> | ||
41 | <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" /> | ||
42 | <testng verbose="2" haltonfailure="true"> | ||
43 | <classpath> | ||
44 | <path refid="unittest.classpath" /> | ||
45 | <path refid="compile.classpath" /> | ||
46 | <pathelement location="${classes.test.dir}" /> | ||
47 | </classpath> | ||
48 | <classfileset dir="${build.test.dir}" includes="**/*.class"/> | ||
49 | <jvmarg value="-DdisableLoadJNIScilab=1"/> | ||
50 | </testng> | ||
51 | </target> | ||
52 | </project> | 39 | </project> |