96652

2 files changed, 15 insertions, 8 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java
index 4651f7addf..85b0e5d1ba 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/SwtPerformanceTestCase.java
@@ -47,6 +47,13 @@ protected PerformanceMeter createMeter(String id) {
 	return meter;
 }
 
+protected PerformanceMeter createMeterWithoutSummary(String id) {
+	Performance performance = Performance.getDefault();
+	String scenarioId = "org.eclipse.swt.test." + id;
+	PerformanceMeter meter = performance.createPerformanceMeter(scenarioId);
+	return meter;
+}
+
 protected void disposeMeter(PerformanceMeter meter) {
 	try {
 		meter.commit();
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 c7cce6917f..19265686b8 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
@@ -61,8 +61,7 @@ public void test_createComposites() {
 	int samples;
 
     Performance performance = Performance.getDefault();
-    performance.tagAsGlobalSummary(meter, "Create composites", Dimension.ELAPSED_PROCESS);
-    performance.setComment(meter, Performance.EXPLAINS_DEGRADATION_COMMENT, "Unreproducable regression.  See bug 96652.");
+    performance.setComment(meter, Performance.EXPLAINS_DEGRADATION_COMMENT, "For unknown reasons this test has a performance regression on the 2 GHz Linux machine.  The regression is not reproducable on similar machines.  See bug 96652.");
 	
 	// Warm up.
 	for(samples = 0; samples < 2; samples++) {
@@ -96,7 +95,11 @@ public void test_createComposites() {
 public void test_createWidgets() {
 	PerformanceMeter meter = createMeter("Create composites and widgets");
 	int samples;
-	
+
+    Performance performance = Performance.getDefault();
+    performance.tagAsGlobalSummary(meter, "Create composites and widgets", Dimension.ELAPSED_PROCESS);
+    performance.setComment(meter, Performance.EXPLAINS_DEGRADATION_COMMENT, "For unknown reasons this test has a performance regression on the 2 GHz Linux machine.  The regression is not reproducable on similar machines.  See bug 96652.");
+
 	for(samples = 0; samples < 10; samples++) {
 		Shell shell = new Shell(display);
 		shell.setLayout(new FillLayout());
@@ -281,7 +284,7 @@ public void test_windowDrawing() {
 }
 
 public void test_stringDrawing() {
-	PerformanceMeter meter = createMeter("Draw strings using GC.drawText");
+	PerformanceMeter meter = createMeterWithoutSummary("Draw strings using GC.drawText");
 	int samples;
 	
 	for(samples = 0; samples < 10; samples++) {
@@ -329,12 +332,9 @@ public void test_stringDrawing() {
 }
 
 public void test_fastStringDrawing() {
-	PerformanceMeter meter = createMeter("Draw strings using GC.drawString()");
+	PerformanceMeter meter = createMeterWithoutSummary("Draw strings using GC.drawString()");
 	int samples;
 
-    Performance performance = Performance.getDefault();
-    performance.tagAsGlobalSummary(meter, "Draw strings using GC.drawString()", Dimension.ELAPSED_PROCESS);
-
 	for(samples = 0; samples < 10; samples++) {
 		int width = 640;
 		int height = 480;