Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2015-02-04 22:31:08 -0500
committerGerrit Code Review @ Eclipse.org2015-02-06 13:02:28 -0500
commitafd11359e6369b16625c6238e839ca9f7cbfae9c (patch)
tree32322b4f3b34ef3c5b03e010a5a8dab3637de2e3
parent7f0174bec53752956f27d51053f1d2450084b5cb (diff)
downloadorg.eclipse.cdt-afd11359e6369b16625c6238e839ca9f7cbfae9c.tar.gz
org.eclipse.cdt-afd11359e6369b16625c6238e839ca9f7cbfae9c.tar.xz
org.eclipse.cdt-afd11359e6369b16625c6238e839ca9f7cbfae9c.zip
Extract test VM args to common property base.test.vmargs
This makes it easier to change arguments for all tests. As a side-effect, all tests now enable assertion (-ea) and have the same max heap size, etc. Change-Id: I0965d40ba3283efe7eacdf927f6c302ee0ab30f0 Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
-rw-r--r--build/org.eclipse.cdt.make.core.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.make.ui.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml2
-rw-r--r--codan/org.eclipse.cdt.codan.core.test/pom.xml2
-rw-r--r--core/org.eclipse.cdt.alltests/pom.xml2
-rw-r--r--core/org.eclipse.cdt.core.tests/pom.xml2
-rw-r--r--core/org.eclipse.cdt.ui.tests/pom.xml2
-rw-r--r--debug/org.eclipse.cdt.debug.ui.tests/pom.xml2
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml2
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml2
-rw-r--r--pom.xml5
-rw-r--r--qt/org.eclipse.cdt.qt.tests/pom.xml2
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml2
-rw-r--r--xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml2
-rw-r--r--xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml2
16 files changed, 18 insertions, 17 deletions
diff --git a/build/org.eclipse.cdt.make.core.tests/pom.xml b/build/org.eclipse.cdt.make.core.tests/pom.xml
index 977ec3aa6b..f5e0686108 100644
--- a/build/org.eclipse.cdt.make.core.tests/pom.xml
+++ b/build/org.eclipse.cdt.make.core.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.make.ui.tests/pom.xml b/build/org.eclipse.cdt.make.ui.tests/pom.xml
index 92fe8bea18..5ac33e1c2e 100644
--- a/build/org.eclipse.cdt.make.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.make.ui.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllMakeUITests.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
index bc76988f0b..523b8ecc1d 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
@@ -33,7 +33,7 @@
<configuration>
<!-- Yes, the managed build core tests use the UI harness. -->
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllManagedBuildTests.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
index 3e90eba998..3b54dfe9d0 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllManagedBuildUITests.*</include>
</includes>
diff --git a/codan/org.eclipse.cdt.codan.core.test/pom.xml b/codan/org.eclipse.cdt.codan.core.test/pom.xml
index 45a4f924bb..2d1e8d6de7 100644
--- a/codan/org.eclipse.cdt.codan.core.test/pom.xml
+++ b/codan/org.eclipse.cdt.codan.core.test/pom.xml
@@ -24,7 +24,7 @@
<configuration>
<!-- Need UI harness for quick fix tests -->
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/core/org.eclipse.cdt.alltests/pom.xml b/core/org.eclipse.cdt.alltests/pom.xml
index 67f68ca2c7..cacb0880e8 100644
--- a/core/org.eclipse.cdt.alltests/pom.xml
+++ b/core/org.eclipse.cdt.alltests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes>
<include>**/UPCParserTestSuite.*</include>
</includes>
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index 13cbeac33b..4433c6897b 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -33,7 +33,7 @@
<configuration>
<useUIHarness>false</useUIHarness>
<!-- Core tests actually use eclipse.ui classes, see CProjectHelper -->
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index fc94bc7d84..52d281c2d0 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -31,7 +31,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AutomatedSuite.*</include>
</includes>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/pom.xml b/debug/org.eclipse.cdt.debug.ui.tests/pom.xml
index 0870319b60..a271f37537 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/pom.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllDebugTests.*</include>
</includes>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
index 94da0962b8..ff213d903c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
@@ -34,7 +34,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllTests.*</include>
</includes>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
index f9a4db726f..3e30f1bb2c 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes>
<include>**/LRParserTestSuite.*</include>
</includes>
diff --git a/pom.xml b/pom.xml
index 89468b2d16..14c428b030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
<target-platform>cdt-e4.4</target-platform>
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4</help-docs-eclipserun-repo>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
+ <base.test.vmargs>-Xms256m -Xmx512m -XX:MaxPermSize=256m -ea</base.test.vmargs>
</properties>
<licenses>
@@ -251,7 +252,7 @@
</os>
</activation>
<properties>
- <base.ui.test.vmargs>-XstartOnFirstThread</base.ui.test.vmargs>
+ <base.ui.test.vmargs>${base.test.vmargs} -XstartOnFirstThread</base.ui.test.vmargs>
</properties>
</profile>
<profile>
@@ -262,7 +263,7 @@
</os>
</activation>
<properties>
- <base.ui.test.vmargs></base.ui.test.vmargs>
+ <base.ui.test.vmargs>${base.test.vmargs}</base.ui.test.vmargs>
</properties>
</profile>
<profile>
diff --git a/qt/org.eclipse.cdt.qt.tests/pom.xml b/qt/org.eclipse.cdt.qt.tests/pom.xml
index 6125ce9dca..7cf286ec79 100644
--- a/qt/org.eclipse.cdt.qt.tests/pom.xml
+++ b/qt/org.eclipse.cdt.qt.tests/pom.xml
@@ -32,7 +32,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllQtTests.*</include>
</includes>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
index 67f68ca2c7..cacb0880e8 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes>
<include>**/UPCParserTestSuite.*</include>
</includes>
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
index 8f237d7046..012245357b 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes>
<include>**/XlcTestSuite.*</include>
</includes>
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
index 989e92e104..3be6b07677 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes>
<include>**/AllXlcErrorParserTests.*</include>
</includes>

Back to the top