mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Bug 552745: Disable intro screen (webkit use) in tests

Browse source 
Change-Id: Ib97fb00cb96af34a14d89a07d88de15c276537aa
This commit is contained in:
Jonah Graham 2019-11-06 16:10:49 -05:00
parent 23bac92ae3
commit a5a2be90e7
9 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.core.tests/pom.xml
View file

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

1
core/org.eclipse.cdt.ui.tests/pom.xml
View file

@ -65,6 +65,7 @@
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread> <useUIThread>true</useUIThread>
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs.indexer.timeout} ${extra.vmargs.displayhelper.timeoutmultipler}</argLine> <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> <includes>
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>

1
debug/org.eclipse.cdt.debug.application.tests/pom.xml
View file

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

9
debug/org.eclipse.cdt.debug.dap/debug-servers/yarn.lock
View file

@ -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": "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" 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: dependencies:
node-addon-api "^1.6.2" 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: minimist@0.0.8:
version "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" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.1.tgz#cf813cd69bb8d9100f6bdca6755fc268f54ac492"
integrity sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ== integrity sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ==
vscode-debugadapter@^1.32.1: vscode-debugadapter@^1.37.1:
version "1.37.1" version "1.37.1"
resolved "https://registry.yarnpkg.com/vscode-debugadapter/-/vscode-debugadapter-1.37.1.tgz#7d7076e64e9786fe4fcb0c156e1ed24184a9fb2b" resolved "https://registry.yarnpkg.com/vscode-debugadapter/-/vscode-debugadapter-1.37.1.tgz#7d7076e64e9786fe4fcb0c156e1ed24184a9fb2b"
integrity sha512-g/xNsUdkrd0DifaoRJ4+wypSMsMbK47fGpetpmIOnOQiDFjtYKvqxsgyUZ4BOj2jKP2Xa40B4YXfUUJpqreWJg== integrity sha512-g/xNsUdkrd0DifaoRJ4+wypSMsMbK47fGpetpmIOnOQiDFjtYKvqxsgyUZ4BOj2jKP2Xa40B4YXfUUJpqreWJg==
@ -34,7 +35,7 @@ vscode-debugadapter@^1.32.1:
mkdirp "^0.5.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, vscode-debugprotocol@^1.37.0:
version "1.37.0" version "1.37.0"
resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.37.0.tgz#e8c4694a078d18ea1a639553a7a241b35c1e6f6d" resolved "https://registry.yarnpkg.com/vscode-debugprotocol/-/vscode-debugprotocol-1.37.0.tgz#e8c4694a078d18ea1a639553a7a241b35c1e6f6d"
integrity sha512-ppZLEBbFRVNsK0YpfgFi/x2CDyihx0F+UpdKmgeJcvi05UgSXYdO0n9sDVYwoGvvYQPvlpDQeWuY0nloOC4mPA== integrity sha512-ppZLEBbFRVNsK0YpfgFi/x2CDyihx0F+UpdKmgeJcvi05UgSXYdO0n9sDVYwoGvvYQPvlpDQeWuY0nloOC4mPA==

3
disable_intro_in_tests.ini Normal file
View file

@ -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

2
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
View file

@ -59,7 +59,7 @@
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <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> <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> <includes>
<include>**/${dsf.gdb.tests.gdbTestSuite}</include> <include>**/${dsf.gdb.tests.gdbTestSuite}</include>
</includes> </includes>

2
jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/pom.xml
View file

@ -59,7 +59,7 @@
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <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> <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> <includes>
<include>**/${dsf.gdb.tests.gdbTestSuite}</include> <include>**/${dsf.gdb.tests.gdbTestSuite}</include>
</includes> </includes>

1
lsp/org.eclipse.cdt.lsp.core.tests/pom.xml
View file

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

3
pom.xml
View file

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