From 433aaea7bbe20e5d3dc10d0b9a518276fcb8ca63 Mon Sep 17 00:00:00 2001
From: Steffen Pingel
Date: Thu, 1 Mar 2012 15:53:11 +0100
Subject: setup integration tests on slave7

Bug: 372971
Change-Id: I0dffd5c9adf24ffd7374214a144e0adf678ed1cf
---
 org.eclipse.mylyn.commons.activity.tests/pom.xml   | 23 +++++++++++-----------
 .../pom.xml                                        | 23 +++++++++++-----------
 .../pom.xml                                        |  2 +-
 org.eclipse.mylyn.commons.tests/pom.xml            | 23 +++++++++++-----------
 org.eclipse.mylyn.commons.ui.tests/pom.xml         | 22 ++++++++++-----------
 org.eclipse.mylyn.discovery.tests/pom.xml          | 23 +++++++++++-----------
 .../mylyn/discovery/tests/AllDiscoveryTests.java   | 12 ++++++++---
 org.eclipse.mylyn.monitor.tests/pom.xml            | 23 +++++++++++-----------
 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 18041cb0..34d53813 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 7d59a989..e90f4151 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 10feae01..76a2ca4d 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 5c705669..f26688a8 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 a347f884..990c456e 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 c6a8c58b..1b72fa0f 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 b1c51166..8c4e192c 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 b19ac4c7..f1a38e1f 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>
-- 
cgit v1.2.3