revert from separation of JFacePerformanceSuite
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java
index 91d5453..6cca754 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSuite.java
@@ -13,6 +13,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.eclipse.jface.tests.performance.JFacePerformanceSuite;
import org.eclipse.ui.tests.presentations.PresentationPerformanceTestSuite;
/**
@@ -36,5 +37,6 @@
addTest(new WorkbenchPerformanceSuite());
addTest(new ViewPerformanceSuite());
addTest(new EditorPerformanceSuite());
+ addTest(new JFacePerformanceSuite());
}
}
diff --git a/tests/org.eclipse.ui.tests/test.xml b/tests/org.eclipse.ui.tests/test.xml
index 9d92749..e32d98b 100644
--- a/tests/org.eclipse.ui.tests/test.xml
+++ b/tests/org.eclipse.ui.tests/test.xml
@@ -96,12 +96,6 @@
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname" value="org.eclipse.ui.tests.performance.UIPerformanceTestSuite"/>
</ant>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="timeout" value="14400000"/>
- <property name="data-dir" value="${performance-workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jface.tests.performance.JFacePerformanceSuite"/>
- </ant>
</target>
</project>
