summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-04 02:55:12 +0100
committerSven Gothel <[email protected]>2010-11-04 02:55:12 +0100
commit691e72c21ea17ef84b4d483970675862a9d6c3bc (patch)
treee8b72aba3a1860ba7d2ff08360dbd3d21a8108d5 /make
parent185283b656978a8d3443705f86524c7cbf87b58b (diff)
Revert xml test result name change of junit.run.newt.headless, so hudson can digg it
Diffstat (limited to 'make')
-rw-r--r--make/build-junit.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml
index e9f292e27..2536d56ab 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -124,7 +124,7 @@
<packagemapper from="*.class" to="*"/> <!-- FQCN -->
</chainedmapper>
</pathconvert>
- <var name="test.class.result.file" value="${results.junit}/TEST-headless-${test.class.fqn}.xml"/>
+ <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/>
<echo message="Testing ${test.class.fqn} -> ${test.class.result.file}"/>
<apply dir="." executable="${java.home}/bin/java"
parallel="false"
@@ -160,8 +160,11 @@
</for>
</target>
- <!-- junit.run.newt is covered by junit.run.newt.headless, disable it for now, but may be checked manually -->
- <!-- NEWT is currently not supported on OSX -->
+ <!-- junit.run.newt is covered by junit.run.newt.headless, disable it for now, but may be checked manually.
+ This test target would also overwrite the test result XML files, we would also need a solution here for hudson,
+ if run in parallel.
+ NEWT is currently not supported on OSX
+ -->
<target name="junit.run.newt" depends="junit.run.setup" unless="isOSX">
<!-- Test*NEWT* -->
<junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}">