Merge branch 'fixOom'

eclipse · Mar 31, 2024 · 9f63c5a · 9f63c5a
2 parents 79ba901 + e675d6f
commit 9f63c5a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/launching/org.eclipse.rcptt.launching/.classpath b/launching/org.eclipse.rcptt.launching/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/launching/org.eclipse.rcptt.launching/.settings/org.eclipse.jdt.core.prefs b/launching/org.eclipse.rcptt.launching/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=16
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=16
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=16
diff --git a/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF b/launching/org.eclipse.rcptt.launching/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rcptt.core.launching;bundle-version="[2.5.5,3.0.0)",
  org.eclipse.rcptt.verifications;bundle-version="[2.5.5,3.0.0)",
  org.eclipse.rcptt.reporting.util;bundle-version="[2.5.5,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rcptt.internal.launching,
  org.eclipse.rcptt.internal.launching.aut,

diff --git a/...e.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/ConsoleOutputListener.java b/...e.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/ConsoleOutputListener.java
@@ -19,6 +19,7 @@
 
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.IStreamListener;
+import org.eclipse.debug.core.model.IFlushableStreamMonitor;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IStreamMonitor;
 import org.eclipse.debug.core.model.IStreamsProxy;
@@ -72,6 +73,10 @@ public void startLogging(AutLaunch launch) {
 		this.launch = launch;
 		for (IStreamMonitor sm : getMonitors(launch.getLaunch())) {
 			sm.addListener(listener);
+			if (sm instanceof IFlushableStreamMonitor flushable) {
+				log.append(sm.getContents());
+				flushable.setBuffered(false);  // Fixes OutOfMemoryError
+			}
 		}
 
 	}
@@ -82,6 +87,9 @@ public void stopLogging() {
 			return;
 		for (IStreamMonitor sm : getMonitors(launch2.getLaunch())) {
 			sm.removeListener(listener);
+			if (sm instanceof IFlushableStreamMonitor flushable) {
+				flushable.setBuffered(true);
+			}
 		}
 		launch = null;
 	}

diff --git a/maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java b/maven-plugin/rcptt-maven-plugin/src/main/java/org/eclipse/rcptt/maven/ExecuteMojo.java
@@ -84,7 +84,7 @@ public class ExecuteMojo extends AbstractRCPTTMojo {
 	private static final String ENABLE_SOFTWARE_INSTALLATION = "-enableSoftwareInstallation";
 
 	private static int shutdownListenerPort;
-	private static final String[] DEFAULT_Q7_VM_ARGS = new String[] { "-Xms256m", "-Xmx512m",
+	private static final String[] DEFAULT_Q7_VM_ARGS = new String[] { "-Xms128m", "-Xmx256m",
 			"-Dorg.eclipse.rcptt.runner.returnTestFailure=true" };
 
 	// TODO: Replace this random number with carefully thought one