Merge pull request #18339 from flooxo/master

Removed duplicate System.gc() in test
eclipse-openj9 · Nov 8, 2023 · 0a0620e · 0a0620e
2 parents 70f5655 + 1b76dbd
commit 0a0620e
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 25 deletions.
diff --git a/test/functional/JIT_Test/src/jit/test/finalizer/TestObject.java b/test/functional/JIT_Test/src/jit/test/finalizer/TestObject.java
@@ -67,12 +67,8 @@ public static boolean isFinalized(String name) {
 
 	protected static void thoroughGCandFinalization() {
 		System.gc();
-		System.gc();
-		System.runFinalization();
 		System.runFinalization();
 		System.gc();
-		System.gc();
-		System.runFinalization();
 		System.runFinalization();
 	}
 

diff --git a/...tional/JLM_Tests/src/org/openj9/test/java/lang/management/TestGarbageCollectorMXBean.java b/...tional/JLM_Tests/src/org/openj9/test/java/lang/management/TestGarbageCollectorMXBean.java
@@ -114,7 +114,6 @@ protected void setUp() throws Exception {
 	public final void testGetLastGcInfo() {
 		AssertJUnit.assertTrue(gcb instanceof com.sun.management.GarbageCollectorMXBean);
 		System.gc();
-		System.gc();
 		AssertJUnit.assertTrue(((com.sun.management.GarbageCollectorMXBean)gcb).getLastGcInfo() != null);
 	}
 

diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/GarbageCollectionCondyTest.java b/test/functional/Java11andUp/src/org/openj9/test/condy/GarbageCollectionCondyTest.java
@@ -65,7 +65,6 @@ private void runTest(byte[] classBytes, String className) {
 			 new RuntimeException("Error calling method: getCondy()" + e);
 		}
 		System.gc();
-		System.gc();
 		try {
 			Method condyMethod = condyClass.getDeclaredMethod("getCondy");
 			Object result2 = "Result2 initial value";

diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CreateDumps.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CreateDumps.java
@@ -24,7 +24,6 @@
 public class CreateDumps {
 
 	public static void main(String[] args) {
-		System.gc();
 		System.gc();
 		com.ibm.jvm.Dump.HeapDump();	
 		com.ibm.jvm.Dump.SystemDump();

diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/ClassUnloadingTestParent.java b/test/functional/VM_Test/src/j9vm/test/classunloading/ClassUnloadingTestParent.java
@@ -62,12 +62,8 @@ public void runTest() throws Exception {
 
 protected static void thoroughGCandFinalization() {
 	System.gc();
-	System.gc();
-	System.runFinalization();
 	System.runFinalization();
 	System.gc();
-	System.gc();
-	System.runFinalization();
 	System.runFinalization();
 }
 

diff --git a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTestParent.java b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTestParent.java
@@ -51,7 +51,6 @@ public HashCodeTestParent(int mode) {
 	public void gc() {
 		switch (mode) {
 		case MODE_SYSTEM_GC:
-			System.gc();
 			System.gc();
 			break;
 		case MODE_SCAVENGE:

diff --git a/test/functional/Valhalla/src_qtypes/org/openj9/test/lworld/ValueTypeTests.java b/test/functional/Valhalla/src_qtypes/org/openj9/test/lworld/ValueTypeTests.java
@@ -339,7 +339,6 @@ static public void testGCFlattenedPoint2DArray() throws Throwable {
 			Array.set(arrayObject, i, point2D);
 		}
 
-		System.gc();
 		System.gc();
 
 		Object value = Array.get(arrayObject, 0);
@@ -354,7 +353,6 @@ static public void testGCFlattenedValueArrayWithSingleAlignment() throws Throwab
 			Array.set(array, i, object);
 		}
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < 4; i++) {
@@ -371,7 +369,6 @@ static public void testGCFlattenedValueArrayWithObjectAlignment() throws Throwab
 			Array.set(array, i, object);
 		}
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < 4; i++) {
@@ -388,7 +385,6 @@ static public void testGCFlattenedValueArrayWithLongAlignment() throws Throwable
 			Array.set(array, i, object);
 		}
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < genericArraySize; i++) {
@@ -405,7 +401,6 @@ static public void testGCFlattenedLargeObjectArray() throws Throwable {
 			Array.set(arrayObject, i, largeObjectRef);
 		}
 
-		System.gc();
 		System.gc();
 
 		Object value = Array.get(arrayObject, 0);
@@ -416,14 +411,12 @@ static public void testGCFlattenedMegaObjectArray() throws Throwable {
 		Object arrayObject = Array.newInstance(megaObjectValueClass, 4);
 		Object megaObjectRef = createMegaObject(new Object());
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < 4; i++) {
 			Array.set(arrayObject, i, megaObjectRef);
 		}
 		System.gc();
-		System.gc();
 
 		Object value = Array.get(arrayObject, 0);
 	}
@@ -2188,7 +2181,6 @@ static public void testCreateLargeNumberOfPoint2D() throws Throwable {
 			MethodHandle makePoint2DX = lookup.findStatic(point2DXClass, "makeValueGeneric", MethodType.methodType(Object.class, Object.class, Object.class));
 			if (0 == (valueIndex % 100)) {
 				System.gc();
-				System.gc();
 			}
 		}
 	}
@@ -2556,7 +2548,6 @@ static public void testValueWithLongAlignmentGCScanning() throws Throwable {
 			longAlignmentArrayList.add(newLongAlignmentArray);
 		}
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < objectGCScanningIterationCount; i++) {
@@ -2582,7 +2573,6 @@ static public void testValueWithObjectAlignmentGCScanning() throws Throwable {
 			objectAlignmentArrayList.add(newObjectAlignmentArray);
 		}
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < objectGCScanningIterationCount; i++) {
@@ -2608,7 +2598,6 @@ static public void testValueWithSingleAlignmentGCScanning() throws Throwable {
 			singleAlignmentArrayList.add(newSingleAlignmentArray);
 		}
 
-		System.gc();
 		System.gc();
 
 		for (int i = 0; i < objectGCScanningIterationCount; i++) {

diff --git a/...mdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestContractionMain.java b/...mdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestContractionMain.java
@@ -68,11 +68,9 @@ public static void main(String[] args)
 			_array = null;
 			System.gc();
 			System.gc();
-			System.gc();
 			long tempMem = runtime.totalMemory();
 			System.gc();
 			System.gc();
-			System.gc();
 			long tempMem2 = runtime.totalMemory();
 
 			if (verbose)