Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-05-22 02:51:19 -0400
committerSteffen Pingel2013-05-22 02:51:19 -0400
commit6c9d4a91689cf4b8e3f2f7cc56f3a3337daabffb (patch)
treee81a007173d28cbe160319b5ca948002e8eaeacd
parent9eb24902c45397f92d9216dbc04b9d52df9a5f90 (diff)
downloadorg.eclipse.mylyn-6c9d4a91689cf4b8e3f2f7cc56f3a3337daabffb.tar.gz
org.eclipse.mylyn-6c9d4a91689cf4b8e3f2f7cc56f3a3337daabffb.tar.xz
org.eclipse.mylyn-6c9d4a91689cf4b8e3f2f7cc56f3a3337daabffb.zip
Revert "408535: remove dependency on SDK from Tycho tests"R_3_9_0
-rw-r--r--org.eclipse.mylyn-parent/pom.xml16
-rw-r--r--org.eclipse.mylyn.maven-parent/pom.xml14
2 files changed, 30 insertions, 0 deletions
diff --git a/org.eclipse.mylyn-parent/pom.xml b/org.eclipse.mylyn-parent/pom.xml
index 1d71fc6..099c347 100644
--- a/org.eclipse.mylyn-parent/pom.xml
+++ b/org.eclipse.mylyn-parent/pom.xml
@@ -799,8 +799,24 @@
<useUIHarness>true</useUIHarness>
<failIfNoTests>true</failIfNoTests>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+ <product>org.eclipse.sdk.ide</product>
+ <application>org.eclipse.ui.ide.workbench</application>
<argLine>${tycho.testArgLine} -Xmx512m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory} ${test.vmargs}</argLine>
<appArgLine>${test.args}</appArgLine>
+ <!--
+ <environmentVariables>
+ <http_proxy>${http_proxy}</http_proxy>
+ <https_proxy>${https_proxy}</https_proxy>
+ </environmentVariables>
+ -->
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>${platform-version}</version>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
</plugins>
diff --git a/org.eclipse.mylyn.maven-parent/pom.xml b/org.eclipse.mylyn.maven-parent/pom.xml
index bc32e39..d31b89e 100644
--- a/org.eclipse.mylyn.maven-parent/pom.xml
+++ b/org.eclipse.mylyn.maven-parent/pom.xml
@@ -250,10 +250,24 @@
<version>${tycho-version}</version>
<configuration>
<skip>${test.skip}</skip>
+ <useUIThread>true</useUIThread>
+ <useUIHarness>true</useUIHarness>
<failIfNoTests>true</failIfNoTests>
<forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
+ <excludes>
+ <exclude>**/Test*java</exclude>
+ </excludes>
<argLine>${tycho.testArgLine} -Xmx512m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory} ${test.vmargs}</argLine>
<appArgLine>${test.args}</appArgLine>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <!-- <product>org.eclipse.sdk.ide</product> -->
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
</plugins>

Back to the top