LUCENE-5920: Revert previous commits (but leave the else attributes)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1622449 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2014-09-04 10:47:17 +00:00
parent 7c54b7f2ce
commit 2ffb741999
1 changed files with 9 additions and 26 deletions

View File

@ -146,9 +146,7 @@
<!-- Max width for class name truncation. -->
<property name="tests.maxClassNameColumns" value="10000" />
<!-- Show suite summaries for tests. -->
<condition property="tests.showSuiteSummary" value="false" else="true">
<isset property="beast.iters"/>
</condition>
<property name="tests.showSuiteSummary" value="true" />
<!-- Show timestamps in console test reports. -->
<property name="tests.timestamps" value="false" />
<!-- Heartbeat in seconds for reporting long running tests or hung forked JVMs. -->
@ -833,28 +831,16 @@
</condition>
<condition property="tests.showSuccess" value="true" else="false">
<and>
<or>
<isset property="tests.class" />
<isset property="tests.method" />
</or>
<not>
<isset property="beast.iters" />
</not>
</and>
<or>
<isset property="tests.class" />
<isset property="tests.method" />
</or>
</condition>
<condition property="tests.showOutput" value="always" else="onerror">
<or>
<and>
<or>
<isset property="tests.class" />
<isset property="tests.method" />
</or>
<not>
<isset property="beast.iters" />
</not>
</and>
<isset property="tests.class" />
<isset property="tests.method" />
<istrue value="${tests.showSuccess}"/>
</or>
</condition>
@ -1161,11 +1147,8 @@
<echo file="${tests.totals.tmpfile}" append="true" encoding="UTF-8"># module: ${ant.project.name}&#x000a;${junit4.stats.nonIgnored}&#x000a;</echo>
<!-- Report the 5 slowest tests from this run to the console. -->
<local name="tests.showtophints"/>
<condition property="tests.showtophints" value="0" else="5">
<isset property="beast.iters"/>
</condition>
<junit4:tophints max="${tests.showtophints}" taskname="slow-tests">
<echo>5 slowest tests:</echo>
<junit4:tophints max="5">
<file file="${tests.cachedir}/${name}/timehints.txt" />
</junit4:tophints>
</sequential>