diff options
Diffstat (limited to 'tests/org.eclipse.swt.tests/test.xml')
-rw-r--r-- | tests/org.eclipse.swt.tests/test.xml | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/tests/org.eclipse.swt.tests/test.xml b/tests/org.eclipse.swt.tests/test.xml index ef295d0917..241827c182 100644 --- a/tests/org.eclipse.swt.tests/test.xml +++ b/tests/org.eclipse.swt.tests/test.xml @@ -22,15 +22,6 @@ </delete> </target> - <!-- This target defines the performance tests that need to be run. --> - <target name="benchmark" if="performance"> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="performance"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.swt.tests.junit.performance.PerformanceTests"/> - </ant> - </target> - <!-- This target defines the tests that need to be run. --> <target name="suite" unless="performance"> <property name="data" value="${eclipse-home}/swt_sniff_folder"/> @@ -54,17 +45,31 @@ <target name="cleanup"> </target> + <!-- This target defines the performance tests that need to be run. --> + <target name="performance-suite"> + <property name="swt-performance-folder" value="${eclipse-home}/swt_performance_folder" /> + <delete dir="${swt-performance-folder}" quiet="true" /> + <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${swt-performance-folder}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.swt.tests.junit.performance.PerformanceTests" /> + </ant> + </target> + + <target name="performance" depends="init,performance-suite,cleanup"> + <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> + <property name="includes" value="org*.xml" /> + <property name="output-file" value="${plugin-name}.xml" /> + </ant> + </target> + <!-- This target runs the test suite. Any actions that need to happen after all --> <!-- the tests have been run should go here. --> - <target name="run" depends="init,suite,benchmark,cleanup"> + <target name="run" depends="init,suite,cleanup"> <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> <property name="includes" value="org*.xml"/> <property name="output-file" value="${plugin-name}.xml"/> </ant> </target> - - <!-- This target runs the performance test suites. --> - <target name="performance"> - </target> - + </project> |