summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-24 18:19:36 +0100
committerSven Gothel <[email protected]>2012-02-24 18:19:36 +0100
commit4af25334965ac9f2b47c7f098b556c02057616cb (patch)
treed6c0259605bfe98f4962a60f792ca7c322eccba5 /make
parent7d0aacbf139d52c8a1ef76c3fa9d753ecfab234a (diff)
If junit.is.disabled, copy a dummy TEST xml file, otherwisa Jenkins claims failure.
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml5
-rw-r--r--make/lib/TEST-com.jogamp.junit.DisabledTest.xml10
2 files changed, 14 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 21f1cb3..51b4f83 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -407,8 +407,11 @@ ${line.separator}
<target name="junit.run.if.enabled" unless="junit.is.disabled">
<antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/>
</target>
+ <target name="junit.run.if.disabled" if="junit.is.disabled">
+ <copy todir="${build}/test/results" file="${gluegen.root}/make/lib/TEST-com.jogamp.junit.DisabledTest.xml"/>
+ </target>
- <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled">
+ <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
<antcall target="test-zip-archive" inheritRefs="true" />
</target>
diff --git a/make/lib/TEST-com.jogamp.junit.DisabledTest.xml b/make/lib/TEST-com.jogamp.junit.DisabledTest.xml
new file mode 100644
index 0000000..e3048ea
--- /dev/null
+++ b/make/lib/TEST-com.jogamp.junit.DisabledTest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="0" failures="0" hostname="dummy" name="com.jogamp.junit.DisabledTest" tests="0" time="0.0" timestamp="2012-02-24T17:08:59">
+ <properties>
+ <property name="java.vm.name" value="A Virtual Machine Not Yet Determined" />
+ <property name="user.country" value="DE" />
+ </properties>
+ <testcase classname="com.jogamp.junit.DisabledTest" name="slice" time="0.011" />
+ <system-out><![CDATA[Unit Tests On This Node Are Disabled!]]></system-out>
+ <system-err><![CDATA[Unit Tests On This Node Are Disabled!]]></system-err>
+</testsuite>