summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-24 18:04:56 +0100
committerSven Gothel <[email protected]>2012-02-24 18:04:56 +0100
commit7d0aacbf139d52c8a1ef76c3fa9d753ecfab234a (patch)
tree613c4f5f3d320ecefdcae6d1d06d30e2f5a5bfb2
parent0dce3191754bd73138ff6a72e576a2af05f850ba (diff)
Even if 'junit.is.disabled', we need to produce the test archive (7z), otherwise the jenkins build fails.
-rw-r--r--make/build-test.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index bfae919..21f1cb3 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -404,8 +404,11 @@ ${line.separator}
<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="junit.run.settings" unless="junit.is.disabled">
+ <target name="junit.run.if.enabled" unless="junit.is.disabled">
<antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/>
+ </target>
+
+ <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled">
<antcall target="test-zip-archive" inheritRefs="true" />
</target>