summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/test.xml20
1 files changed, 18 insertions, 2 deletions
diff --git a/tests/test.xml b/tests/test.xml
index a1be76a13c..5d991f22c9 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -137,9 +137,25 @@
</target>
<target name="run-tests" depends="compile-tests" if="server.start.succeeded">
- <for threadCount="20" parallel="true" keepgoing="true" param="target">
+ <!-- Long tests are prioritized to even out load at the end of the test run -->
+ <!-- If you are interested in certain tests they can temporarily be added here -->
+ <fileset dir="${test-output-dir}" id="priority-tests-fileset">
+ <include name="**/wysiwyg*.java" />
+ <include name="**/reindeer*.java" />
+ <include name="**/runo*.java" />
+ <include name="**/demop*.java" />
+ </fileset>
+
+ <fileset dir="${test-output-dir}" id="other-tests-fileset">
+ <include name="**/**.java" />
+ </fileset>
+
+
+ <for threadCount="20" parallel="true" keepgoing="true" param="target" list="${tests-to-run}" delimiter=" ">
+ <!-- A path element APPARENTLY removes duplicates and therefore this works. Could not find this documented anywhere... -->
<path>
- <fileset dir="${test-output-dir}" includes="**/**.java" />
+ <fileset refid="priority-tests-fileset" />
+ <fileset refid="other-tests-fileset" />
</path>
<sequential>
<antcall target="execute-tests">