releng: Provide a build property to skip automated UI tests

Allow passing a `-Dskip-automated-ui-tests` option to skip running
the automated UI tests (like SWTBot and RCPTT modules) during
the Maven build.

Some setups may want to run these longer tests only in certain
conditions, or at a different frequency than the "normal" unit
tests.

Change-Id: Ifb1d6307d8bf4cddaba4e8835ea5d5e7595bbf80
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-on: https://git.eclipse.org/r/83403
Reviewed-by: Hudson CI
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/README.md b/README.md
index 01a8364ad1687850d9bdda6a11d02a7df14ba151..432836a6bf87f0854b22927e7a90c03c78f5f76f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -70,9 +70,15 @@ the build system. You can set them by using `-P[profile name]` and
   stable platform. To use the staging target for example, use
   `-Dtarget-platform=tracecompass-eStaging`.
 
+* `-Dskip-automated-ui-tests`
+
+  Skips the automated UI integration tests. Not required when using
+  `-Dmaven.test.skip=true`, which already skips all the tests.
+
 * `-Dskip-rcp`
 
-  Skips building the RCP archives and related deployment targets.
+  Skips building the RCP archives and related deployment targets. Only works in
+  conjunction with `-Dskip-automated-ui-tests`, due to a limitation in Maven.
 
 * `-Pctf-grammar`
 

diff --git a/analysis/pom.xml b/analysis/pom.xml
index f5ea8b1aea1a119a0a9be91383cde1ed251d446f..03583f1effee64529631bca3c11a3cd0324b7673 100644 (file)
--- a/analysis/pom.xml
+++ b/analysis/pom.xml
@@ -35,10 +35,23 @@
     <module>org.eclipse.tracecompass.analysis.os.linux.core.tests</module>
     <module>org.eclipse.tracecompass.analysis.os.linux.ui</module>
     <module>org.eclipse.tracecompass.analysis.os.linux.ui.tests</module>
-    <module>org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests</module>
     <module>org.eclipse.tracecompass.analysis.timing.core</module>
     <module>org.eclipse.tracecompass.analysis.timing.core.tests</module>
     <module>org.eclipse.tracecompass.analysis.timing.ui</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>automated-ui-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>

diff --git a/ctf/pom.xml b/ctf/pom.xml
index 8b29f262befa69dadc6641f9e7ff55a18b7026d3..0a1e5fab36382b2b14ddd4883815e239b0924a3f 100644 (file)
--- a/ctf/pom.xml
+++ b/ctf/pom.xml
@@ -34,7 +34,20 @@
     <module>org.eclipse.tracecompass.tmf.ctf</module>
     <module>org.eclipse.tracecompass.tmf.ctf.core</module>
     <module>org.eclipse.tracecompass.tmf.ctf.core.tests</module>
-    <module>org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>automated-ui-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>

diff --git a/lttng/pom.xml b/lttng/pom.xml
index fe5e9d15e8fe689d06c7b10076a9b0c34175429c..8b3c968e4e3eb3a8f46274c46904219530ecd47f 100644 (file)
--- a/lttng/pom.xml
+++ b/lttng/pom.xml
@@ -33,20 +33,33 @@
     <module>org.eclipse.tracecompass.lttng2.control.core.tests</module>
     <module>org.eclipse.tracecompass.lttng2.control.ui</module>
     <module>org.eclipse.tracecompass.lttng2.control.ui.tests</module>
-    <module>org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests</module>
 
     <module>org.eclipse.tracecompass.lttng2.kernel</module>
     <module>org.eclipse.tracecompass.lttng2.kernel.core</module>
     <module>org.eclipse.tracecompass.lttng2.kernel.core.tests</module>
     <module>org.eclipse.tracecompass.lttng2.kernel.ui</module>
-    <module>org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests</module>
 
     <module>org.eclipse.tracecompass.lttng2.ust</module>
     <module>org.eclipse.tracecompass.lttng2.ust.core</module>
     <module>org.eclipse.tracecompass.lttng2.ust.core.tests</module>
     <module>org.eclipse.tracecompass.lttng2.ust.ui</module>
     <module>org.eclipse.tracecompass.lttng2.ust.ui.tests</module>
-    <module>org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>automated-ui-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests</module>
+        <module>org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests</module>
+        <module>org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>

diff --git a/pcap/pom.xml b/pcap/pom.xml
index 2643dca1987a565f4538433ab59d36fcffcc3511..11a2b7c918b092de405a876f8a5404c082ba4b21 100644 (file)
--- a/pcap/pom.xml
+++ b/pcap/pom.xml
@@ -31,7 +31,20 @@
     <module>org.eclipse.tracecompass.tmf.pcap.core</module>
     <module>org.eclipse.tracecompass.tmf.pcap.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.pcap.ui</module>
-    <module>org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>automated-ui-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>

diff --git a/rcp/pom.xml b/rcp/pom.xml
index dca5b235e8431fa333794b7773d4e91f53e9292a..70c0d39825e5653357040e59b10feee8946bfec3 100644 (file)
--- a/rcp/pom.xml
+++ b/rcp/pom.xml
@@ -32,6 +32,19 @@
   </modules>
 
   <profiles>
+    <profile>
+      <id>run-rcp-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.rcp.product</module>
+        <module>org.eclipse.tracecompass.rcp.rcptt.tests</module>
+      </modules>
+    </profile>
+
     <profile>
       <id>build-rcp</id>
       <activation>
@@ -41,7 +54,6 @@
       </activation>
       <modules>
         <module>org.eclipse.tracecompass.rcp.product</module>
-        <module>org.eclipse.tracecompass.rcp.rcptt.tests</module>
       </modules>
     </profile>
   </profiles>

diff --git a/releng/pom.xml b/releng/pom.xml
index 2766c408db8e5fb62c2e76b9880d07f6d9f385f6..eb12663f5c18666f60fda76212de3be3f53fecef 100644 (file)
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -26,11 +26,23 @@
 
   <modules>
     <module>org.eclipse.tracecompass.alltests</module>
-    <module>org.eclipse.tracecompass.integration.swtbot.tests</module>
     <module>org.eclipse.tracecompass.releng-site</module>
     <module>org.eclipse.tracecompass.target</module>
     <module>org.eclipse.tracecompass.testing</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>automated-ui-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.integration.swtbot.tests</module>
+      </modules>
+    </profile>
+  </profiles>
 
 </project>

diff --git a/tmf/pom.xml b/tmf/pom.xml
index 81eeff69f18b4a8f1eda4764ca85781c2fbedbf8..792f3eaf3aee3b3f86df0e88098f22224e08d6ee 100644 (file)
--- a/tmf/pom.xml
+++ b/tmf/pom.xml
@@ -30,13 +30,11 @@
     <module>org.eclipse.tracecompass.tmf.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.ui</module>
     <module>org.eclipse.tracecompass.tmf.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.ui.swtbot.tests</module>
 
     <module>org.eclipse.tracecompass.tmf.analysis.xml.core</module>
     <module>org.eclipse.tracecompass.tmf.analysis.xml.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.analysis.xml.ui</module>
     <module>org.eclipse.tracecompass.tmf.analysis.xml.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests</module>
 
     <module>org.eclipse.tracecompass.tmf.chart.core</module>
     <!-- <module>org.eclipse.tracecompass.tmf.chart.core.tests</module> -->
@@ -47,7 +45,22 @@
     <module>org.eclipse.tracecompass.tmf.remote.core.tests</module>
     <module>org.eclipse.tracecompass.tmf.remote.ui</module>
     <module>org.eclipse.tracecompass.tmf.remote.ui.tests</module>
-    <module>org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>automated-ui-tests</id>
+      <activation>
+        <property>
+          <name>!skip-automated-ui-tests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>org.eclipse.tracecompass.tmf.ui.swtbot.tests</module>
+        <module>org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests</module>
+        <module>org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>