Google Git
Sign in
eclipse/cdt/org.eclipse.cdt/refs/heads/cdt_9_9^!/.
commit
298d5ea740a5054409e1930e68ce6716ce5bf983
[log]
author
Jonah Graham <jonah@kichwacoders.com>
Wed Nov 06 16:10:49 2019 -0500
committer
Jonah Graham <jonah@kichwacoders.com>
Thu Nov 07 09:35:41 2019 -0500
tree
ed52986e68d4e89806410ba69ffc31477ba8ab9f
parent
6db088cd45cc2b8b12b419cf1928c370a4c0d7aa [diff]
Bug 552745: Disable intro screen (webkit use) in tests

Change-Id: Ib97fb00cb96af34a14d89a07d88de15c276537aa

diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index 79303b6..16f5b2c 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml

@@ -43,6 +43,7 @@
 					<useUIHarness>false</useUIHarness>
 					<!-- Core tests actually use eclipse.ui classes, see CProjectHelper -->
 					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs}</argLine>
+					<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					<includes>
 						<include>**/AutomatedIntegrationSuite.*</include>
 					</includes>

diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index 8911f21..5d4e16e 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml

@@ -65,6 +65,7 @@
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
 					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs.indexer.timeout} ${extra.vmargs.displayhelper.timeoutmultipler}</argLine>
+					<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					<includes>
 						<include>**/AutomatedSuite.*</include>
 					</includes>

diff --git a/debug/org.eclipse.cdt.debug.application.tests/pom.xml b/debug/org.eclipse.cdt.debug.application.tests/pom.xml
index 50ac16e..f2481c4 100644
--- a/debug/org.eclipse.cdt.debug.application.tests/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.tests/pom.xml

@@ -36,6 +36,7 @@
           <product>org.eclipse.cdt.debug.application.product</product>
           <application>org.eclipse.cdt.debug.application.app</application>
           <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+					<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
           <includes>
              <include>**/AllTests.*</include>
           </includes>

diff --git a/disable_intro_in_tests.ini b/disable_intro_in_tests.ini
new file mode 100644
index 0000000..ceec1e1
--- /dev/null
+++ b/disable_intro_in_tests.ini

@@ -0,0 +1,3 @@
+# Bug 552745 - we can't showIntro on CI machine because there is no working webkit there and due to bug 552716 that causes
+# eclipse to have a hard crash
+org.eclipse.ui/showIntro=false
\ No newline at end of file

diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index 4b3280f..c8d9fbf 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml

@@ -59,7 +59,7 @@
 				<configuration>
 					<useUIHarness>false</useUIHarness>
 					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
-                    <appArgLine>-debug ./dsf.debug.options</appArgLine>
+                    <appArgLine>-debug ./dsf.debug.options -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					<includes>
 						<include>**/${dsf.gdb.tests.gdbTestSuite}</include>
 					</includes>

diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
index 36ff049..a2796b0 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml

@@ -59,7 +59,7 @@
 				<configuration>
 					<useUIHarness>false</useUIHarness>
 					<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -Dcdt.tests.dsf.gdb.path=${dsf.gdb.tests.gdbPath} -Ddsf.gdb.tests.timeout.multiplier=${dsf.gdb.tests.timeout.multiplier} -Dcdt.tests.dsf.gdb.versions=${cdt.tests.dsf.gdb.versions}</argLine>
-					<appArgLine>-debug ./dsf.debug.options</appArgLine>
+					<appArgLine>-debug ./dsf.debug.options -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					<includes>
 						<include>**/${dsf.gdb.tests.gdbTestSuite}</include>
 					</includes>

diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml
index 1bd4c4d..546fac8 100644
--- a/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml
+++ b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml

@@ -25,6 +25,7 @@
                     <useUIHarness>true</useUIHarness>
                     <useUIThread>true</useUIThread>
                     <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+					<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
                 <!-- else, if you have no UI tests, use this block -->
                     <!-- <useUIHarness>false</useUIHarness>
                     <useUIThread>false</useUIThread>

diff --git a/pom.xml b/pom.xml
index 12c457c..c52c600 100644
--- a/pom.xml
+++ b/pom.xml

@@ -438,6 +438,7 @@
 						<useUIHarness>true</useUIHarness>
 						<useUIThread>true</useUIThread>
 						<argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+						<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					</configuration>
 				</plugin>
 				</plugins>
@@ -460,6 +461,7 @@
 						<useUIHarness>true</useUIHarness>
 						<useUIThread>false</useUIThread>
 						<argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+						<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					</configuration>
 				</plugin>
 				</plugins>
@@ -808,6 +810,7 @@
 						</dependencies>
 						<product>org.eclipse.platform.ide</product>
 						<argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
+						<appArgLine>-pluginCustomization ${basedir}/../../disable_intro_in_tests.ini</appArgLine>
 					</configuration>
 				</plugin>
 				<plugin>