Bug 572393 - Intermittent random junit gerrit failures in jdt.core (timeI20210506-1800

related)

put performance asserts under a new flag
   -Djdt.performance.asserts=disabled / enabled*

Change-Id: Ief7ef7a14bd0336961b0a977fd12b63bae8e8a32

2 files changed, 7 insertions, 2 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
index 89441a4bf8..d4c1feb544 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
@@ -52890,8 +52890,12 @@ protected void assertCompileTimes(final List<Duration> shortTimes, final double
 			+ longTimesAverage + "ms should be less than " + factor + "x the minimum short compile time " + shortTimesAverage +"ms\n"
 			+ "long compile times: "+longTimes+"\n"
 			+ "short compile times: "+shortTimes;
-	assertTrue(message,longTimesAverage < factor*shortTimesAverage);
-	System.out.println(message);
+	if (PERFORMANCE_ASSERTS) {
+		assertTrue(message,longTimesAverage < factor*shortTimesAverage);
+		System.out.println(message);
+	} else if (longTimesAverage >= factor*shortTimesAverage) {
+		System.out.println(message);
+	}
 }
 
 protected double minExcludingBoundaries(final List<Duration> durations) {
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
index 55a127fa21..a705a2befa 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/util/AbstractCompilerTest.java
@@ -50,6 +50,7 @@ public class AbstractCompilerTest extends TestCase {
 	public static final int F_16  = 0x2000;
 
 	public static final boolean RUN_JAVAC = CompilerOptions.ENABLED.equals(System.getProperty("run.javac"));
+	public static final boolean PERFORMANCE_ASSERTS = !CompilerOptions.DISABLED.equals(System.getProperty("jdt.performance.asserts"));
 	private static final int UNINITIALIZED = -1;
 	private static final int NONE = 0;
 	private static int possibleComplianceLevels = UNINITIALIZED;