NEW - bug 372971: setup integration tests on slave7
https://bugs.eclipse.org/bugs/show_bug.cgi?id=372971
diff --git a/org.eclipse.mylyn.sandbox.tests/pom.xml b/org.eclipse.mylyn.sandbox.tests/pom.xml
index 1685825..f4819b2 100644
--- a/org.eclipse.mylyn.sandbox.tests/pom.xml
+++ b/org.eclipse.mylyn.sandbox.tests/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
@@ -11,17 +11,18 @@
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <test.suite>${project.artifactId}.AllSandboxTests</test.suite>
+ <test.suite>${project.artifactId}.AllSandboxTests</test.suite>
</properties>
<build>
<plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>${project.artifactId}</testSuite>
- <testClass>${test.suite}</testClass>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <skip>${test.component.skip}</skip>
+ <testSuite>${project.artifactId}</testSuite>
+ <testClass>${test.suite}</testClass>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
@@ -34,8 +35,8 @@
<version>0.0.0</version>
</dependency>
</dependencies>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
diff --git a/org.eclipse.mylyn.tests.performance/pom.xml b/org.eclipse.mylyn.tests.performance/pom.xml
index a8a5e62..e07f84f 100644
--- a/org.eclipse.mylyn.tests.performance/pom.xml
+++ b/org.eclipse.mylyn.tests.performance/pom.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
- <groupId>org.eclipse.mylyn</groupId>
+ <groupId>org.eclipse.mylyn.incubator</groupId>
<version>3.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.tests.performance</artifactId>
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <mylyn-performance-test-suite>org.eclipse.mylyn.tests.performance.AllPerformanceTests</mylyn-performance--test-suite>
+ <test.suite>${project.artifactId}.AllPerformanceTests</test.suite>
</properties>
<build>
<plugins>
@@ -20,11 +20,10 @@
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <useUIHarness>true</useUIHarness>
- <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
- <testSuite>org.eclipse.mylyn.tests.performance</testSuite>
- <testClass>${test.suite}</testClass>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory}</argLine>
+ <skip>${test.performance.skip}</skip>
+ <useUIThread>false</useUIThread>
+ <testSuite>${project.artifactId}</testSuite>
+ <testClass>${test.suite}</testClass>
</configuration>
</plugin>
<plugin>
diff --git a/org.eclipse.mylyn.tests.ui/pom.xml b/org.eclipse.mylyn.tests.ui/pom.xml
index efadaac..cb7de82 100644
--- a/org.eclipse.mylyn.tests.ui/pom.xml
+++ b/org.eclipse.mylyn.tests.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.eclipse.mylyn.incubator-parent</artifactId>
@@ -11,23 +11,8 @@
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <mylyn-ui-test-suite>org.eclipse.mylyn.tests.ui.AllUiTests</mylyn-ui-test-suite>
- <mylyn-skip-ui-test>${maven.test.skip}</mylyn-skip-ui-test>
+ <test.suite>${project.artifactId}.AllUiTests</test.suite>
</properties>
- <profiles>
- <profile>
- <id>heartbeat</id>
- <properties>
- <mylyn-skip-ui-test>true</mylyn-skip-ui-test>
- </properties>
- </profile>
- <profile>
- <id>incubator</id>
- <properties>
- <mylyn-skip-ui-test>true</mylyn-skip-ui-test>
- </properties>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
@@ -35,21 +20,10 @@
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <skip>${mylyn-skip-ui-test}</skip>
- <useUIHarness>true</useUIHarness>
+ <skip>${test.system.skip}</skip>
<useUIThread>false</useUIThread>
- <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
- <testSuite>org.eclipse.mylyn.tests.ui</testSuite>
- <testClass>${mylyn-ui-test-suite}</testClass>
- <argLine>-Xmx1024m -XX:MaxPermSize=256m -Djava.io.tmpdir=${project.build.directory} ${test.vmargs}</argLine>
- <appArgLine>${test.args}</appArgLine>
- <dependencies>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.sdk.feature.group</artifactId>
- <version>${platform-version}</version>
- </dependency>
- </dependencies>
+ <testSuite>${project.artifactId}</testSuite>
+ <testClass>${test.suite}</testClass>
</configuration>
</plugin>
<plugin>
