mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-02 13:13:36 +02:00
Code Issues Wiki Activity

Let the Tycho build specify the indexer timeout during tests

Browse source 
Running maven with mvn clean install -Dindexer.timeout=123 doesn't
have any effect since tests to not inherit the VM args from Maven.
But we can pass those VM args manually in the pom.xml

Change-Id: I17b4aecdc422e3035e583b6d057c8487e7e41650
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
This commit is contained in:
Marc-Andre Laperle 2016-08-17 01:03:33 -04:00 • committed by Gerrit Code Review @ Eclipse.org
parent 8fd27dfb2b
commit cf0271a5ed
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,10 @@
<artifactId>org.eclipse.cdt.core.tests</artifactId> <artifactId>org.eclipse.cdt.core.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <packaging>eclipse-test-plugin</packaging>
<properties>
<extra.vmargs></extra.vmargs>
</properties>
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
<!-- <repositories> <!-- <repositories>
<repository> <repository>
@ -24,6 +28,20 @@
</repository> </repository>
</repositories>--> </repositories>-->
<profiles>
<profile>
<id>indexer-timeout-set</id>
<activation>
<property>
<name>indexer.timeout</name>
</property>
</activation>
<properties>
<extra.vmargs>-Dindexer.timeout=${indexer.timeout}</extra.vmargs>
</properties>
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -33,7 +51,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}</argLine> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs}</argLine>
<includes> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

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

@ -14,7 +14,11 @@
<version>5.5.0-SNAPSHOT</version> <version>5.5.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.ui.tests</artifactId> <artifactId>org.eclipse.cdt.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <packaging>eclipse-test-plugin</packaging>
<properties>
<extra.vmargs></extra.vmargs>
</properties>
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
<!-- <repositories> <!-- <repositories>
<repository> <repository>
@ -23,6 +27,21 @@
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories>--> </repositories>-->
<profiles>
<profile>
<id>indexer-timeout-set</id>
<activation>
<property>
<name>indexer.timeout</name>
</property>
</activation>
<properties>
<extra.vmargs>-Dindexer.timeout=${indexer.timeout}</extra.vmargs>
</properties>
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -31,7 +50,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs}</argLine>
<includes> <includes>
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>