From 3ac3b039faaa853d8ffbdc5395391ceabd052df1 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 23 Sep 2008 05:23:34 +0000
Subject: [PATCH] 248213 need to reduce memory on build machine
---
releng.wtpbuilder/distribution/dali.tests/build.xml | 5 +----
.../distribution/dali.tests/testScripts/junit-tests.xml | 3 +--
releng.wtpbuilder/distribution/patches.tests/build.xml | 3 +--
.../patches.tests/testScripts/wtp-junit-tests.xml | 4 +---
releng.wtpbuilder/distribution/patches2.tests/build.xml | 6 ++----
.../patches2.tests/testScripts/wtp-junit-tests.xml | 4 +---
releng.wtpbuilder/distribution/patches3.tests/build.xml | 6 ++----
.../patches3.tests/testScripts/wtp-junit-tests.xml | 4 +---
releng.wtpbuilder/distribution/wtp.tests/build.xml | 6 +-----
.../distribution/wtp.tests/testScripts/wtp-junit-tests.xml | 4 +---
releng.wtpbuilder/distribution/xml.tests/build.xml | 6 ++----
.../distribution/xml.tests/testScripts/wtp-junit-tests.xml | 4 +---
releng.wtpbuilder/distribution/xsl.tests/build.xml | 4 +---
.../distribution/xsl.tests/testScripts/wtp-junit-tests.xml | 4 +---
14 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 668699ede..01aecf51d 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 9d3231c6b..3bedbf330 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 f60def5e0..f8b943cb0 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 37eb753e4..786b912b3 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 686d4429a..0a76d397a 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 563a0f2a4..d745400b9 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 937c86cfa..c9ae7bf86 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 8eccce38c..09e30b2fe 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 e7edc792d..26f74d4b9 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 2fecb26d4..f9f4ff06c 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 530eb6e21..2a8ae6adc 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 86a88f925..ff81fb362 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 426b03b28..bf67ce0ba 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 2e41a2bc5..5108dad4e 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
--
GitLab