Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2016-08-17 05:03:33 +0000
committerGerrit Code Review @ Eclipse.org2016-08-17 18:50:42 +0000
commitcf0271a5edd706218978c49fa29a3473992424d7 (patch)
tree121cfe90b6fd3251038405b0dad187a2fbdad759
parent8fd27dfb2bc87ebe62443a5fe5888a9aa9cdcbac (diff)
downloadorg.eclipse.cdt-cf0271a5edd706218978c49fa29a3473992424d7.tar.gz
org.eclipse.cdt-cf0271a5edd706218978c49fa29a3473992424d7.tar.xz
org.eclipse.cdt-cf0271a5edd706218978c49fa29a3473992424d7.zip
Let the Tycho build specify the indexer timeout during tests
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>
-rw-r--r--core/org.eclipse.cdt.core.tests/pom.xml20
-rw-r--r--core/org.eclipse.cdt.ui.tests/pom.xml23
2 files changed, 40 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index 782ede7e9c2..635fbdc28bf 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -15,6 +15,10 @@
<artifactId>org.eclipse.cdt.core.tests</artifactId>
<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 -->
<!-- <repositories>
<repository>
@@ -24,6 +28,20 @@
</repository>
</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>
<plugins>
<plugin>
@@ -33,7 +51,7 @@
<configuration>
<useUIHarness>false</useUIHarness>
<!-- 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>
<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 475d641c84c..cf8f7d2f13e 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -14,7 +14,11 @@
<version>5.5.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.ui.tests</artifactId>
<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 -->
<!-- <repositories>
<repository>
@@ -23,6 +27,21 @@
<layout>p2</layout>
</repository>
</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>
<plugins>
<plugin>
@@ -31,7 +50,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs}</argLine>
<includes>
<include>**/AutomatedSuite.*</include>
</includes>

Back to the top