From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Thu, 26 Mar 2015 19:09:11 +0000 (-0400)
Subject: Add property to control GTK version used in SWTBot tests
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=c4998bb21be1e15af6727ad9ff9c049697bcacf8;p=deliverable%2Ftracecompass.git

Add property to control GTK version used in SWTBot tests

This will allow test builds for GTK3.

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

diff --git a/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/pom.xml b/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/pom.xml
index cee65fbb0d..225bc439a3 100644
--- a/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/pom.xml
@@ -38,9 +38,8 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
-<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
           <environmentVariables>
-            <SWT_GTK3>0</SWT_GTK3>
+            <SWT_GTK3>${SWT_GTK3}</SWT_GTK3>
           </environmentVariables>
         </configuration>
       </plugin>
diff --git a/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/pom.xml b/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/pom.xml
index d06ead4262..820351c70d 100644
--- a/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/pom.xml
@@ -38,9 +38,8 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
-<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
           <environmentVariables>
-            <SWT_GTK3>0</SWT_GTK3>
+            <SWT_GTK3>${SWT_GTK3}</SWT_GTK3>
           </environmentVariables>
         </configuration>
       </plugin>
diff --git a/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/pom.xml b/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/pom.xml
index 8a4c8b8420..7bd6284ae3 100644
--- a/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/pom.xml
@@ -38,9 +38,8 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
-<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
           <environmentVariables>
-            <SWT_GTK3>0</SWT_GTK3>
+            <SWT_GTK3>${SWT_GTK3}</SWT_GTK3>
           </environmentVariables>
         </configuration>
       </plugin>
diff --git a/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/pom.xml b/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/pom.xml
index 545987e73a..b82b12bcc1 100644
--- a/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/pom.xml
@@ -38,9 +38,8 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
-<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
           <environmentVariables>
-            <SWT_GTK3>0</SWT_GTK3>
+            <SWT_GTK3>${SWT_GTK3}</SWT_GTK3>
           </environmentVariables>
         </configuration>
       </plugin>
diff --git a/org.eclipse.tracecompass.tmf.ui.swtbot.tests/pom.xml b/org.eclipse.tracecompass.tmf.ui.swtbot.tests/pom.xml
index 27043549bd..aaa2fb6c58 100644
--- a/org.eclipse.tracecompass.tmf.ui.swtbot.tests/pom.xml
+++ b/org.eclipse.tracecompass.tmf.ui.swtbot.tests/pom.xml
@@ -38,9 +38,8 @@
           <useUIThread>false</useUIThread>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
           <product>org.eclipse.platform.ide</product>
-<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
           <environmentVariables>
-            <SWT_GTK3>0</SWT_GTK3>
+            <SWT_GTK3>${SWT_GTK3}</SWT_GTK3>
           </environmentVariables>
         </configuration>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 84d0ea0080..c319d56d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
   <sonar.java.source>1.7</sonar.java.source>
   <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   <help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4</help-docs-eclipserun-repo>
+  <!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
+  <SWT_GTK3>0</SWT_GTK3>
 </properties>
 
 <pluginRepositories>