mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Extract test VM args to common property base.test.vmargs

Browse source 
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>
This commit is contained in:
Marc-Andre Laperle 2015-02-04 22:31:08 -05:00 • committed by Gerrit Code Review @ Eclipse.org
parent 7f0174bec5
commit afd11359e6
16 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.core.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.make.ui.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllMakeUITests.*</include> <include>**/AllMakeUITests.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
View file

@ -33,7 +33,7 @@
<configuration> <configuration>
<!-- Yes, the managed build core tests use the UI harness. --> <!-- Yes, the managed build core tests use the UI harness. -->
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllManagedBuildTests.*</include> <include>**/AllManagedBuildTests.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllManagedBuildUITests.*</include> <include>**/AllManagedBuildUITests.*</include>
</includes> </includes>

2
codan/org.eclipse.cdt.codan.core.test/pom.xml
View file

@ -24,7 +24,7 @@
<configuration> <configuration>
<!-- Need UI harness for quick fix tests --> <!-- Need UI harness for quick fix tests -->
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
core/org.eclipse.cdt.alltests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes> <includes>
<include>**/UPCParserTestSuite.*</include> <include>**/UPCParserTestSuite.*</include>
</includes> </includes>

2
core/org.eclipse.cdt.core.tests/pom.xml
View file

@ -33,7 +33,7 @@
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<!-- Core tests actually use eclipse.ui classes, see CProjectHelper --> <!-- 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> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
core/org.eclipse.cdt.ui.tests/pom.xml
View file

@ -31,7 +31,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>

2
debug/org.eclipse.cdt.debug.ui.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes> <includes>
<include>**/AllDebugTests.*</include> <include>**/AllDebugTests.*</include>
</includes> </includes>

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
View file

@ -34,7 +34,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllTests.*</include> <include>**/AllTests.*</include>
</includes> </includes>

2
lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes> <includes>
<include>**/LRParserTestSuite.*</include> <include>**/LRParserTestSuite.*</include>
</includes> </includes>

5
pom.xml
View file

@ -25,6 +25,7 @@
<target-platform>cdt-e4.4</target-platform> <target-platform>cdt-e4.4</target-platform>
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4</help-docs-eclipserun-repo> <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> <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> </properties>
<licenses> <licenses>
@ -251,7 +252,7 @@
</os> </os>
</activation> </activation>
<properties> <properties>
<base.ui.test.vmargs>-XstartOnFirstThread</base.ui.test.vmargs> <base.ui.test.vmargs>${base.test.vmargs} -XstartOnFirstThread</base.ui.test.vmargs>
</properties> </properties>
</profile> </profile>
<profile> <profile>
@ -262,7 +263,7 @@
</os> </os>
</activation> </activation>
<properties> <properties>
<base.ui.test.vmargs></base.ui.test.vmargs> <base.ui.test.vmargs>${base.test.vmargs}</base.ui.test.vmargs>
</properties> </properties>
</profile> </profile>
<profile> <profile>

2
qt/org.eclipse.cdt.qt.tests/pom.xml
View file

@ -32,7 +32,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllQtTests.*</include> <include>**/AllQtTests.*</include>
</includes> </includes>

2
upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes> <includes>
<include>**/UPCParserTestSuite.*</include> <include>**/UPCParserTestSuite.*</include>
</includes> </includes>

2
xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes> <includes>
<include>**/XlcTestSuite.*</include> <include>**/XlcTestSuite.*</include>
</includes> </includes>

2
xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
<includes> <includes>
<include>**/AllXlcErrorParserTests.*</include> <include>**/AllXlcErrorParserTests.*</include>
</includes> </includes>