diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 668699ede57838ab5a06622f3c8318827cf5c16e..01aecf51d1524b56c88172ea671259d8c515a3e4 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -112,7 +112,7 @@
value="${testRoot}/eclipse/plugins" />
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
+ value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
<!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
@@ -157,9 +157,6 @@
</fileset>
</classpath>
- <jvmarg value="-Xms512m" />
- <jvmarg value="-Xmx1024m" />
-
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
index 9d3231c6b480df82a21acc86307c00730170d51d..3bedbf3308d7f1bae161de8a61125f1632ebcc42 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/junit-tests.xml
@@ -190,8 +190,7 @@
</fileset>
</classpath>
- <jvmarg value="-Xms256m" />
- <jvmarg value="-Xmx1024m" />
+ <jvmarg value="-Xmx758m" />
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
index f60def5e036594643de1ccf3333d05e30c533a67..f8b943cb00ffa13e500cfb54528db34f57990f49 100644
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/build.xml
@@ -139,7 +139,7 @@
value="${testRoot}/eclipse/plugins" />
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
+ value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
<!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
@@ -180,7 +180,6 @@
dir="${testRoot}/eclipse"
jvm="${env.JAVA_5_HOME}/bin/java">
- <jvmarg value="-Xms256m" />
<jvmarg value="-Xmx512m" />
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
index 37eb753e408aec1752e8c5056c7a3263d9a48bfc..786b912b3f3d5051220bc9d3c02e383903d3d886 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
@@ -190,9 +190,7 @@
dir="${testRoot}/eclipse"
jvm="${env.JAVA_5_HOME}/bin/java">
-
- <jvmarg value="-Xms256m" />
- <jvmarg value="-Xmx1024m" />
+ <jvmarg value="-Xmx758m" />
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
diff --git a/releng.wtpbuilder/distribution/patches2.tests/build.xml b/releng.wtpbuilder/distribution/patches2.tests/build.xml
index 686d4429a4470882b4ee203708252649b84acdd2..0a76d397a8ab69614bd4c785ee48bfdef1090cef 100644
--- a/releng.wtpbuilder/distribution/patches2.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches2.tests/build.xml
@@ -164,7 +164,7 @@
value="${testRoot}/eclipse/plugins"/>
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
+ value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
<!--
set path to eclipse folder. If local folder, use '.';
otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -211,9 +211,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms512m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx512m"/>
<jvmarg
value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
index 563a0f2a40bd9121bf03f968e9156b5bcb02f873..d745400b97e74a830190b7afec896f585044dc2c 100644
--- a/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches2.tests/testScripts/wtp-junit-tests.xml
@@ -177,9 +177,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms256m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx758m"/>
<jvmarg
value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches3.tests/build.xml b/releng.wtpbuilder/distribution/patches3.tests/build.xml
index 937c86cfa57a18333b9d1d70acfe0e4e820899d0..c9ae7bf8656866bbe1fe7645d2bd6230af8264b4 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/build.xml
@@ -149,7 +149,7 @@
value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
+ value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
<!--
set path to eclipse folder. If local folder, use '.';
otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -198,9 +198,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms512m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx758m"/>
<jvmarg
value="-Xverify"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
index 8eccce38c95df5a6fe43f3b2c4ae2d5864a9e9d9..09e30b2febfc8c8071d8fc04d9d8bfe83c8e47e5 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
@@ -198,9 +198,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms256m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx758m"/>
<jvmarg
value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index e7edc792d6c0d91f447996b830cd583f8e8d428b..26f74d4b92736d571486c55f811b848c48531579 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -173,7 +173,7 @@
value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
+ value="-Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
<!--
set path to eclipse folder. If local folder, use '.';
otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -221,10 +221,6 @@
name="org.eclipse.equinox.launcher_*.jar"/>
</fileset>
</classpath>
- <jvmarg
- value="-Xms512m"/>
- <jvmarg
- value="-Xmx1024m"/>
<jvmarg
value="-Xverify"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index 2fecb26d4134553b4c2d865657dd733a612d590b..f9f4ff06c0d9873b298185d9aeea4d893a476ece 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -198,9 +198,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms256m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx758m"/>
<jvmarg
value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
index 530eb6e2107c8871a41d87c2e6f5a63e0b4b45df..2a8ae6adcdcd938b0ce0defa636f5bd1d76fc8f0 100644
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/build.xml
@@ -173,7 +173,7 @@
value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
+ value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}"/>
<!--
set path to eclipse folder. If local folder, use '.';
otherwise, use c:\path\to\eclipse or /path/to/eclipse/
@@ -222,9 +222,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms512m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx512m"/>
<jvmarg
value="-Xverify"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
index 86a88f925e588b4d4750a387f2393f6ff972f150..ff81fb362a2c3113fdf57f8771c940e3404e0c07 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
@@ -198,9 +198,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms256m"/>
- <jvmarg
- value="-Xmx1024m"/>
+ value="-Xmx758m"/>
<jvmarg
value="-Dosgi.ws=${env.BASEWS}"/>
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xsl.tests/build.xml b/releng.wtpbuilder/distribution/xsl.tests/build.xml
index 426b03b28d4f6a93290461ecc7b053f7d341054b..bf67ce0baf431956a9d795f8279003eeabe9f156 100644
--- a/releng.wtpbuilder/distribution/xsl.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xsl.tests/build.xml
@@ -152,7 +152,7 @@
value="${testRoot}${dropinsFolder}/eclipse/plugins" />
<property
name="vmargs"
- value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
+ value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
<!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
@@ -184,8 +184,6 @@
name="org.eclipse.equinox.launcher_*.jar" />
</fileset>
</classpath>
- <jvmarg
- value="-Xms256m" />
<jvmarg
value="-Xmx512m" />
<jvmarg
diff --git a/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml
index 2e41a2bc597087fdaa8b8f1b377a637f393f0581..5108dad4eb2d699cf302373e0be848ed107baccd 100644
--- a/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xsl.tests/testScripts/wtp-junit-tests.xml
@@ -187,9 +187,7 @@
</fileset>
</classpath>
<jvmarg
- value="-Xms256m" />
- <jvmarg
- value="-Xmx1024m" />
+ value="-Xmx512m" />
<jvmarg
value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg