From cf0271a5edd706218978c49fa29a3473992424d7 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Wed, 17 Aug 2016 01:03:33 -0400 Subject: [PATCH] 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 --- core/org.eclipse.cdt.core.tests/pom.xml | 20 +++++++++++++++++++- core/org.eclipse.cdt.ui.tests/pom.xml | 23 +++++++++++++++++++++-- 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 @@ org.eclipse.cdt.core.tests eclipse-test-plugin + + + + + + + indexer-timeout-set + + + indexer.timeout + + + + -Dindexer.timeout=${indexer.timeout} + + + + @@ -33,7 +51,7 @@ false - ${tycho.testArgLine} ${base.ui.test.vmargs} + ${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs} **/AutomatedIntegrationSuite.* 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 @@ 5.5.0-SNAPSHOT org.eclipse.cdt.ui.tests eclipse-test-plugin - + + + + + + + + + indexer-timeout-set + + + indexer.timeout + + + + -Dindexer.timeout=${indexer.timeout} + + + + @@ -31,7 +50,7 @@ ${tycho-version} true - ${tycho.testArgLine} ${base.ui.test.vmargs} + ${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs} **/AutomatedSuite.*