From a5a2be90e76c666e3296dd88785ef0e9db083c54 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Wed, 6 Nov 2019 16:10:49 -0500 Subject: [PATCH] Bug 552745: Disable intro screen (webkit use) in tests Change-Id: Ib97fb00cb96af34a14d89a07d88de15c276537aa --- core/org.eclipse.cdt.core.tests/pom.xml | 1 + core/org.eclipse.cdt.ui.tests/pom.xml | 1 + debug/org.eclipse.cdt.debug.application.tests/pom.xml | 1 + debug/org.eclipse.cdt.debug.dap/debug-servers/yarn.lock | 9 +++++---- disable_intro_in_tests.ini | 3 +++ dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml | 2 +- jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml | 2 +- lsp/org.eclipse.cdt.lsp.core.tests/pom.xml | 1 + pom.xml | 3 +++ 9 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 disable_intro_in_tests.ini diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml index 29fff49e8b1..010ae09f50a 100644 --- a/core/org.eclipse.cdt.core.tests/pom.xml +++ b/core/org.eclipse.cdt.core.tests/pom.xml @@ -44,6 +44,7 @@ false ${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs} + -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini **/AutomatedIntegrationSuite.* diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml index 2b0ffa62413..07807c3a365 100644 --- a/core/org.eclipse.cdt.ui.tests/pom.xml +++ b/core/org.eclipse.cdt.ui.tests/pom.xml @@ -65,6 +65,7 @@ true true ${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs.indexer.timeout} ${extra.vmargs.displayhelper.timeoutmultipler} + -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini **/AutomatedSuite.* diff --git a/debug/org.eclipse.cdt.debug.application.tests/pom.xml b/debug/org.eclipse.cdt.debug.application.tests/pom.xml index d48b93f1b01..f4f4c1442c9 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 @@ org.eclipse.cdt.debug.application.product org.eclipse.cdt.debug.application.app ${tycho.testArgLine} ${base.ui.test.vmargs} + -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini **/AllTests.* diff --git a/debug/org.eclipse.cdt.debug.dap/debug-servers/yarn.lock b/debug/org.eclipse.cdt.debug.dap/debug-servers/yarn.lock index b44dd8e56dd..d533dcf5902 100644 --- a/debug/org.eclipse.cdt.debug.dap/debug-servers/yarn.lock +++ b/debug/org.eclipse.cdt.debug.dap/debug-servers/yarn.lock @@ -4,10 +4,11 @@ "cdt-gdb-adapter@https://ci.eclipse.org/cdt/view/all/job/cdt-gdb-adapter-master/lastSuccessfulBuild/artifact/cdt-gdb-adapter-v0.0.13.tgz": version "0.0.13" - resolved "https://ci.eclipse.org/cdt/view/all/job/cdt-gdb-adapter-master/lastSuccessfulBuild/artifact/cdt-gdb-adapter-v0.0.13.tgz#177b674b04459a660b6b800137bfd23e89ffa278" + resolved "https://ci.eclipse.org/cdt/view/all/job/cdt-gdb-adapter-master/lastSuccessfulBuild/artifact/cdt-gdb-adapter-v0.0.13.tgz#239ccf57dc5403d7365ca073f44e1038be525f21" dependencies: node-addon-api "^1.6.2" - vscode-debugadapter "^1.32.1" + vscode-debugadapter "^1.37.1" + vscode-debugprotocol "^1.37.0" minimist@0.0.8: version "0.0.8" @@ -26,7 +27,7 @@ node-addon-api@^1.6.2: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.1.tgz#cf813cd69bb8d9100f6bdca6755fc268f54ac492" integrity sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ== -vscode-debugadapter@^1.32.1: +vscode-debugadapter@^1.37.1: version "1.37.1" resolved "https://registry.yarnpkg.com/vscode-debugadapter/-/vscode-debugadapter-1.37.1.tgz#7d7076e64e9786fe4fcb0c156e1ed24184a9fb2b" integrity sha512-g/xNsUdkrd0DifaoRJ4+wypSMsMbK47fGpetpmIOnOQiDFjtYKvqxsgyUZ4BOj2jKP2Xa40B4YXfUUJpqreWJg== @@ -34,7 +35,7 @@ vscode-debugadapter@^1.32.1: mkdirp "^0.5.1" vscode-debugprotocol "1.37.0" -vscode-debugprotocol@1.37.0: +vscode-debugprotocol@1.37.0, vscode-debugprotocol@^1.37.0: version "1.37.0" resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.37.0.tgz#e8c4694a078d18ea1a639553a7a241b35c1e6f6d" integrity sha512-ppZLEBbFRVNsK0YpfgFi/x2CDyihx0F+UpdKmgeJcvi05UgSXYdO0n9sDVYwoGvvYQPvlpDQeWuY0nloOC4mPA== diff --git a/disable_intro_in_tests.ini b/disable_intro_in_tests.ini new file mode 100644 index 00000000000..ceec1e159de --- /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 de9a2ff2bd2..682d6ab1e22 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 @@ false ${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} - -debug ./dsf.debug.options + -debug ./dsf.debug.options -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini **/${dsf.gdb.tests.gdbTestSuite} 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 673110bb578..02f3ffaf4a6 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 @@ false ${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} - -debug ./dsf.debug.options + -debug ./dsf.debug.options -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini **/${dsf.gdb.tests.gdbTestSuite} diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml b/lsp/org.eclipse.cdt.lsp.core.tests/pom.xml index 44286541406..5f8bdc5264f 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 @@ true true ${tycho.testArgLine} ${base.ui.test.vmargs} + -pluginCustomization ${basedir}/../../disable_intro_in_tests.ini