From c682d4064f08adbdc1cda65af449cfcac470e2a3 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Fri, 7 Oct 2016 20:02:47 -0400 Subject: [PATCH] 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 Reviewed-on: https://git.eclipse.org/r/83403 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- README.md | 8 +++++++- analysis/pom.xml | 15 ++++++++++++++- ctf/pom.xml | 15 ++++++++++++++- lttng/pom.xml | 19 ++++++++++++++++--- pcap/pom.xml | 15 ++++++++++++++- rcp/pom.xml | 14 +++++++++++++- releng/pom.xml | 14 +++++++++++++- tmf/pom.xml | 19 ++++++++++++++++--- 8 files changed, 107 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 01a8364ad1..432836a6bf 100644 --- 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 f5ea8b1aea..03583f1eff 100644 --- a/analysis/pom.xml +++ b/analysis/pom.xml @@ -35,10 +35,23 @@ org.eclipse.tracecompass.analysis.os.linux.core.tests org.eclipse.tracecompass.analysis.os.linux.ui org.eclipse.tracecompass.analysis.os.linux.ui.tests - org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests org.eclipse.tracecompass.analysis.timing.core org.eclipse.tracecompass.analysis.timing.core.tests org.eclipse.tracecompass.analysis.timing.ui + + + automated-ui-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests + + + + diff --git a/ctf/pom.xml b/ctf/pom.xml index 8b29f262be..0a1e5fab36 100644 --- a/ctf/pom.xml +++ b/ctf/pom.xml @@ -34,7 +34,20 @@ org.eclipse.tracecompass.tmf.ctf org.eclipse.tracecompass.tmf.ctf.core org.eclipse.tracecompass.tmf.ctf.core.tests - org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests + + + automated-ui-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests + + + + diff --git a/lttng/pom.xml b/lttng/pom.xml index fe5e9d15e8..8b3c968e4e 100644 --- a/lttng/pom.xml +++ b/lttng/pom.xml @@ -33,20 +33,33 @@ org.eclipse.tracecompass.lttng2.control.core.tests org.eclipse.tracecompass.lttng2.control.ui org.eclipse.tracecompass.lttng2.control.ui.tests - org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests org.eclipse.tracecompass.lttng2.kernel org.eclipse.tracecompass.lttng2.kernel.core org.eclipse.tracecompass.lttng2.kernel.core.tests org.eclipse.tracecompass.lttng2.kernel.ui - org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests org.eclipse.tracecompass.lttng2.ust org.eclipse.tracecompass.lttng2.ust.core org.eclipse.tracecompass.lttng2.ust.core.tests org.eclipse.tracecompass.lttng2.ust.ui org.eclipse.tracecompass.lttng2.ust.ui.tests - org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests + + + automated-ui-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests + org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests + org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests + + + + diff --git a/pcap/pom.xml b/pcap/pom.xml index 2643dca198..11a2b7c918 100644 --- a/pcap/pom.xml +++ b/pcap/pom.xml @@ -31,7 +31,20 @@ org.eclipse.tracecompass.tmf.pcap.core org.eclipse.tracecompass.tmf.pcap.core.tests org.eclipse.tracecompass.tmf.pcap.ui - org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests + + + automated-ui-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests + + + + diff --git a/rcp/pom.xml b/rcp/pom.xml index dca5b235e8..70c0d39825 100644 --- a/rcp/pom.xml +++ b/rcp/pom.xml @@ -32,6 +32,19 @@ + + run-rcp-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.rcp.product + org.eclipse.tracecompass.rcp.rcptt.tests + + + build-rcp @@ -41,7 +54,6 @@ org.eclipse.tracecompass.rcp.product - org.eclipse.tracecompass.rcp.rcptt.tests diff --git a/releng/pom.xml b/releng/pom.xml index 2766c408db..eb12663f5c 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -26,11 +26,23 @@ org.eclipse.tracecompass.alltests - org.eclipse.tracecompass.integration.swtbot.tests org.eclipse.tracecompass.releng-site org.eclipse.tracecompass.target org.eclipse.tracecompass.testing + + + automated-ui-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.integration.swtbot.tests + + + diff --git a/tmf/pom.xml b/tmf/pom.xml index 81eeff69f1..792f3eaf3a 100644 --- a/tmf/pom.xml +++ b/tmf/pom.xml @@ -30,13 +30,11 @@ org.eclipse.tracecompass.tmf.core.tests org.eclipse.tracecompass.tmf.ui org.eclipse.tracecompass.tmf.ui.tests - org.eclipse.tracecompass.tmf.ui.swtbot.tests org.eclipse.tracecompass.tmf.analysis.xml.core org.eclipse.tracecompass.tmf.analysis.xml.core.tests org.eclipse.tracecompass.tmf.analysis.xml.ui org.eclipse.tracecompass.tmf.analysis.xml.ui.tests - org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests org.eclipse.tracecompass.tmf.chart.core @@ -47,7 +45,22 @@ org.eclipse.tracecompass.tmf.remote.core.tests org.eclipse.tracecompass.tmf.remote.ui org.eclipse.tracecompass.tmf.remote.ui.tests - org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests + + + automated-ui-tests + + + !skip-automated-ui-tests + + + + org.eclipse.tracecompass.tmf.ui.swtbot.tests + org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests + org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests + + + + -- 2.34.1