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

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 @@
                 <delete dir="${checkstyle.report.dir}"/>
         </target>
 
-        <target name="test" depends="compile-test">
+        <target name="test" depends="compile-test, validate" if="test-present">
         <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" />
             <testng verbose="2"  haltonfailure="true">
                   <classpath>
@@ -171,6 +171,10 @@
            </testng>
          </target>
 
+        <target name="validate">
+        <!-- Empty target to be override by other build.xml -->
+        </target>
+
         <target name="init">
                 <mkdir dir="${classes.dir}"/>
                 <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 @@
       file="etc/palettes.xml" />
   </target>
 
-  <!-- Overload the test target dependencies -->
-  <target name="test" depends="compile-test, validate">
-    <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" />
-    <testng verbose="2"  haltonfailure="true">
-            <classpath>
-        <path refid="unittest.classpath" />
-        <path refid="compile.classpath" />
-        <pathelement location="${classes.test.dir}" />
-      </classpath>
-            <classfileset dir="${build.test.dir}" includes="**/*.class"/>
-      <jvmarg value="-DdisableLoadJNIScilab=1"/>
-    </testng>
-  </target>
 </project>