Remove swtbot workaround for Kepler SR1

We don't need the profiles anymore because SWT_GTK3=0
behaves as it should in Kepler SR2.

Change-Id: I67f0f44defc3fd743e37cf33a5f299db1faa9d3c
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/25130
Tested-by: Hudson CI

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml
index b522afe93756c8dfb25c8b41b1268515bc59c447..b4c41723397c483c9473f75582dd7c5484b81453 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests/pom.xml
@@ -25,10 +25,7 @@
 
   <name>Linux Tools LTTng Kernel UI SWTBot Tests Plug-in</name>
 
-<profiles>
-  <profile>
-    <id>platform-kepler</id>
-    <build>
+  <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
@@ -41,42 +38,14 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
+          <environmentVariables>
+            <!-- Disable GTK3 with Luna because it makes the test hang (bug in SWT?) -->
+            <SWT_GTK3>0</SWT_GTK3>
+          </environmentVariables>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  </profile>
-  <profile>
-    <id>platform-luna</id>
-    <activation>
-      <activeByDefault>true</activeByDefault>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <testSuite>org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests</testSuite>
-            <testClass>org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests.AllTests</testClass>
-            <useUIHarness>true</useUIHarness>
-            <useUIThread>false</useUIThread>
-            <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
-            <product>org.eclipse.platform.ide</product>
-            <environmentVariables>
-              <!-- Disable GTK3 with Luna because it makes the test hang (bug in SWT?)
-                   Note that we can't set this variable to 0 in Kepler because as soon as
-                   it is defined to any value, it gets enabled, see
-                   https://bugs.eclipse.org/bugs/show_bug.cgi?id=423220      -->
-              <SWT_GTK3>0</SWT_GTK3>
-            </environmentVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
-</profiles>
 
  <groupId>org.eclipse.linuxtools.lttng2</groupId>
 </project>

diff --git a/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml b/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml
index 152c51160a98b9ae41b3f0f530d4421bdcea5697..3b6938f4a5820a5740ff57200029ee30007deed7 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests/pom.xml
@@ -25,10 +25,7 @@
 
   <name>CTF Support for TMF SWTBot Tests Plug-in</name>
 
-<profiles>
-  <profile>
-    <id>platform-kepler</id>
-    <build>
+  <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
@@ -41,42 +38,14 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
+          <environmentVariables>
+            <!-- Disable GTK3 with Luna because it makes the test hang (bug in SWT?) -->
+            <SWT_GTK3>0</SWT_GTK3>
+          </environmentVariables>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  </profile>
-  <profile>
-    <id>platform-luna</id>
-    <activation>
-      <activeByDefault>true</activeByDefault>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <testSuite>org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests</testSuite>
-            <testClass>org.eclipse.linuxtools.tmf.ctf.ui.swtbot.tests.AllTests</testClass>
-            <useUIHarness>true</useUIHarness>
-            <useUIThread>false</useUIThread>
-            <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
-            <product>org.eclipse.platform.ide</product>
-            <environmentVariables>
-              <!-- Disable GTK3 with Luna because it makes the test hang (bug in SWT?)
-                   Note that we can't set this variable to 0 in Kepler because as soon as
-                   it is defined to any value, it gets enabled, see
-                   https://bugs.eclipse.org/bugs/show_bug.cgi?id=423220      -->
-              <SWT_GTK3>0</SWT_GTK3>
-            </environmentVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
-</profiles>
 
  <groupId>org.eclipse.linuxtools.tmf</groupId>
 </project>

diff --git a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml
index b4651d2f272ff2e44e949a260bd2699e53dbd1d8..1070df810774c05ec53bdbb0c29679ae36527611 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.ui.swtbot.tests/pom.xml
@@ -25,10 +25,7 @@
 
   <name>Linux Tools TMF UI SWTBot Tests Plug-in</name>
 
-<profiles>
-  <profile>
-    <id>platform-kepler</id>
-    <build>
+  <build>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
@@ -41,42 +38,14 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
+          <environmentVariables>
+            <!-- Disable GTK3 with Luna because it makes the test hang (bug in SWT?) -->
+            <SWT_GTK3>0</SWT_GTK3>
+          </environmentVariables>
         </configuration>
       </plugin>
     </plugins>
   </build>
-  </profile>
-  <profile>
-    <id>platform-luna</id>
-    <activation>
-      <activeByDefault>true</activeByDefault>
-    </activation>
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <testSuite>org.eclipse.linuxtools.tmf.ui.swtbot.tests</testSuite>
-            <testClass>org.eclipse.linuxtools.tmf.ui.swtbot.tests.AllTmfUISWTBotTests</testClass>
-            <useUIHarness>true</useUIHarness>
-            <useUIThread>false</useUIThread>
-            <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
-            <product>org.eclipse.platform.ide</product>
-            <environmentVariables>
-              <!-- Disable GTK3 with Luna because it makes the test hang (bug in SWT?)
-                   Note that we can't set this variable to 0 in Kepler because as soon as
-                   it is defined to any value, it gets enabled, see
-                   https://bugs.eclipse.org/bugs/show_bug.cgi?id=423220      -->
-              <SWT_GTK3>0</SWT_GTK3>
-            </environmentVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>
-  </profile>
-</profiles>
 
  <groupId>org.eclipse.linuxtools.tmf</groupId>
 </project>