From 0dce3191754bd73138ff6a72e576a2af05f850ba Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 24 Feb 2012 17:43:45 +0100
Subject: Introduce environment-var/property to disable unit tests (per node)

JUNIT_DISABLED -> junit.is.disabled
---
 make/build-test.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'make/build-test.xml')

diff --git a/make/build-test.xml b/make/build-test.xml
index 4c06b7b..bfae919 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -373,7 +373,7 @@ ${line.separator}
         </junit>
     </target>
 
-    <target name="junit.run.settings">
+    <target name="junit.run.settings" depends="init, gluegen.cpptasks.detect.os">
         <!-- Use absolute path -->
         <property name="gluegen.lib.abs" location="${gluegen.lib}" />
         <property name="build_t.lib.abs" location="${build_t.lib}" />
@@ -386,7 +386,7 @@ ${line.separator}
         <mkdir dir="${build}/test/results"/>
     </target>
 
-    <target name="junit.run.d32" if="isOSX">
+    <target name="junit.run.local.d32" if="isOSX">
         <var name="jvmDataModel.arg" unset="true"/>
         <var name="jvmDataModel.arg" value="-d32"/>
 
@@ -402,9 +402,10 @@ ${line.separator}
         <var name="jvmDataModel.arg" value="-d64"/>
     </target>
 
-    <target name="junit.run.tests" depends="junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/>
+    <target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/>
 
-    <target name="junit.run" depends="init, gluegen.cpptasks.detect.os, junit.run.settings, junit.run.d32, junit.run.tests">
+    <target name="junit.run" depends="junit.run.settings" unless="junit.is.disabled">
+        <antcall target="junit.run.tests"      inheritRefs="true" inheritAll="true"/>
         <antcall target="test-zip-archive" inheritRefs="true" />
     </target>
 
-- 
cgit v1.2.3