Update with the latest performance tests from HEAD.

2 files changed, 9 insertions, 3 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
index dc1f5e7a9f..c68282e908 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
@@ -361,8 +361,6 @@ public void test_drawImageLorg_eclipse_swt_graphics_ImageII() {
 		count /= 100;
 		
 		meter = createMeter("GC drawImage - transparent");
-		Performance performance = Performance.getDefault();
-		performance.tagAsGlobalSummary(meter, "GC.drawImage() transparent * " + count, Dimension.CPU_TIME);
 		meter.start();
 		for (int i = 0; i < count; i++) {
 			gc.drawImage(imageTransparent, coords[i][0], coords[i][1]);	// transparent image
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java
index 728d17c173..fb2ae44c21 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_situational.java
@@ -17,6 +17,8 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.*;
+import org.eclipse.test.performance.Dimension;
+import org.eclipse.test.performance.Performance;
 import org.eclipse.test.performance.PerformanceMeter;
 
 /**
@@ -57,6 +59,9 @@ protected void setUp() throws Exception {
 public void test_createComposites() {
 	PerformanceMeter meter = createMeter("Create 1000 composites");
 	int samples;
+
+    Performance performance = Performance.getDefault();
+    performance.tagAsGlobalSummary(meter, "Create 1000 composites", Dimension.CPU_TIME);
 	
 	// Warm up.
 	for(samples = 0; samples < 2; samples++) {
@@ -322,7 +327,10 @@ public void test_stringDrawing() {
 public void test_fastStringDrawing() {
 	PerformanceMeter meter = createMeter("2000 strings by GC.drawString()");
 	int samples;
-	
+
+    Performance performance = Performance.getDefault();
+    performance.tagAsGlobalSummary(meter, "2000 strings by GC.drawString()", Dimension.CPU_TIME);
+
 	for(samples = 0; samples < 10; samples++) {
 		int width = 640;
 		int height = 480;