summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-03-01 09:53:11 (EST)
committerSteffen Pingel2012-03-01 09:53:11 (EST)
commit433aaea7bbe20e5d3dc10d0b9a518276fcb8ca63 (patch)
tree5b21954a5e7ebbdbbfb58a63558ab448f2c54468
parent1bf14249cc6a754c34f54d5803a6eaff2e50abd3 (diff)
downloadorg.eclipse.mylyn.commons-433aaea7bbe20e5d3dc10d0b9a518276fcb8ca63.zip
org.eclipse.mylyn.commons-433aaea7bbe20e5d3dc10d0b9a518276fcb8ca63.tar.gz
org.eclipse.mylyn.commons-433aaea7bbe20e5d3dc10d0b9a518276fcb8ca63.tar.bz2
setup integration tests on slave7
-rw-r--r--org.eclipse.mylyn.commons.activity.tests/pom.xml23
-rw-r--r--org.eclipse.mylyn.commons.notifications.tests/pom.xml23
-rw-r--r--org.eclipse.mylyn.commons.repositories.http.tests/pom.xml2
-rw-r--r--org.eclipse.mylyn.commons.tests/pom.xml23
-rw-r--r--org.eclipse.mylyn.commons.ui.tests/pom.xml22
-rw-r--r--org.eclipse.mylyn.discovery.tests/pom.xml23
-rw-r--r--org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java12
-rw-r--r--org.eclipse.mylyn.monitor.tests/pom.xml23
8 files changed, 81 insertions, 70 deletions
diff --git a/org.eclipse.mylyn.commons.activity.tests/pom.xml b/org.eclipse.mylyn.commons.activity.tests/pom.xml
index 18041cb..34d5381 100644
--- a/org.eclipse.mylyn.commons.activity.tests/pom.xml
+++ b/org.eclipse.mylyn.commons.activity.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.commons-parent</artifactId>
@@ -11,7 +11,7 @@
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <test.suite>${project.artifactId}.AllActivityTests</test.suite>
+ <test.suite>${project.artifactId}.AllActivityTests</test.suite>
</properties>
<build>
<plugins>
@@ -19,15 +19,16 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>${project.artifactId}</testSuite>
- <testClass>${test.suite}</testClass>
- </configuration>
- </plugin>
+ <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>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/org.eclipse.mylyn.commons.notifications.tests/pom.xml b/org.eclipse.mylyn.commons.notifications.tests/pom.xml
index 7d59a98..e90f415 100644
--- a/org.eclipse.mylyn.commons.notifications.tests/pom.xml
+++ b/org.eclipse.mylyn.commons.notifications.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.commons-parent</artifactId>
@@ -11,7 +11,7 @@
<version>0.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <test.suite>${project.artifactId}.AllNotificationsTests</test.suite>
+ <test.suite>${project.artifactId}.AllNotificationsTests</test.suite>
</properties>
<build>
<plugins>
@@ -19,15 +19,16 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>${project.artifactId}</testSuite>
- <testClass>${test.suite}</testClass>
- </configuration>
- </plugin>
+ <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>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/org.eclipse.mylyn.commons.repositories.http.tests/pom.xml b/org.eclipse.mylyn.commons.repositories.http.tests/pom.xml
index 10feae0..76a2ca4 100644
--- a/org.eclipse.mylyn.commons.repositories.http.tests/pom.xml
+++ b/org.eclipse.mylyn.commons.repositories.http.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.commons-parent</artifactId>
diff --git a/org.eclipse.mylyn.commons.tests/pom.xml b/org.eclipse.mylyn.commons.tests/pom.xml
index 5c70566..f26688a 100644
--- a/org.eclipse.mylyn.commons.tests/pom.xml
+++ b/org.eclipse.mylyn.commons.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.commons-parent</artifactId>
@@ -11,19 +11,20 @@
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <test.suite>${project.artifactId}.AllCommonsTests</test.suite>
+ <test.suite>${project.artifactId}.AllCommonsTests</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>
- </configuration>
- </plugin>
+ <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>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
diff --git a/org.eclipse.mylyn.commons.ui.tests/pom.xml b/org.eclipse.mylyn.commons.ui.tests/pom.xml
index a347f88..990c456 100644
--- a/org.eclipse.mylyn.commons.ui.tests/pom.xml
+++ b/org.eclipse.mylyn.commons.ui.tests/pom.xml
@@ -1,22 +1,22 @@
<?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">
+ 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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.mylyn.commons-parent</artifactId>
- <groupId>org.eclipse.mylyn.commons</groupId>
- <version>3.7.0-SNAPSHOT</version>
+ <artifactId>org.eclipse.mylyn.commons-parent</artifactId>
+ <groupId>org.eclipse.mylyn.commons</groupId>
+ <version>3.7.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.mylyn.commons.ui.tests</artifactId>
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/org.eclipse.mylyn.discovery.tests/pom.xml b/org.eclipse.mylyn.discovery.tests/pom.xml
index c6a8c58..1b72fa0 100644
--- a/org.eclipse.mylyn.discovery.tests/pom.xml
+++ b/org.eclipse.mylyn.discovery.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.commons-parent</artifactId>
@@ -11,19 +11,20 @@
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <test.suite>${project.artifactId}.AllDiscoveryTests</test.suite>
+ <test.suite>${project.artifactId}.AllDiscoveryTests</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>
- </configuration>
- </plugin>
+ <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>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
diff --git a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java
index b1c5116..8c4e192 100644
--- a/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java
+++ b/org.eclipse.mylyn.discovery.tests/src/org/eclipse/mylyn/discovery/tests/AllDiscoveryTests.java
@@ -26,12 +26,18 @@ import org.eclipse.mylyn.discovery.tests.core.RemoteBundleDiscoveryStrategyTest;
public class AllDiscoveryTests {
public static Test suite() {
- TestSuite suite = new TestSuite("Tests for org.eclipse.mylyn.discovery");
+ return suite(false);
+ }
+
+ public static Test suite(boolean localOnly) {
+ TestSuite suite = new TestSuite(AllDiscoveryTests.class.getName());
suite.addTestSuite(ConnectorDiscoveryTest.class);
suite.addTestSuite(DirectoryParserTest.class);
suite.addTestSuite(BundleDiscoveryStrategyTest.class);
- suite.addTestSuite(RemoteBundleDiscoveryStrategyTest.class);
- suite.addTestSuite(ConnectorDiscoveryRemoteTest.class);
+ if (!localOnly) {
+ suite.addTestSuite(RemoteBundleDiscoveryStrategyTest.class);
+ suite.addTestSuite(ConnectorDiscoveryRemoteTest.class);
+ }
return suite;
}
diff --git a/org.eclipse.mylyn.monitor.tests/pom.xml b/org.eclipse.mylyn.monitor.tests/pom.xml
index b19ac4c..f1a38e1 100644
--- a/org.eclipse.mylyn.monitor.tests/pom.xml
+++ b/org.eclipse.mylyn.monitor.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.commons-parent</artifactId>
@@ -11,7 +11,7 @@
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
- <test.suite>${project.artifactId}.AllMonitorTests</test.suite>
+ <test.suite>${project.artifactId}.AllMonitorTests</test.suite>
</properties>
<build>
<plugins>
@@ -19,15 +19,16 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>${project.artifactId}</testSuite>
- <testClass>${test.suite}</testClass>
- </configuration>
- </plugin>
+ <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>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>