mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1278282 - Update of the tests to reflect the removal of the gtk2 r=lsalzman 

MozReview-Commit-ID: Htgc44dCEjX

--HG--
extra : rebase_source : 55ce6a6a72c36cbfdbeef08fe58d11f2053dc35f
This commit is contained in:
Sylvestre Ledru 2018-01-10 08:55:38 +01:00
Родитель 2c6660f219
Коммит 4b189b7baf
12 изменённых файлов: 22 добавлений и 88 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
browser/base/content/test/general/browser.ini
Просмотреть файл

@ -299,10 +299,10 @@ skip-if = e10s # Clicks in content don't go through contentAreaClick with e10s.
[browser_contextmenu.js] [browser_contextmenu.js]
subsuite = clipboard subsuite = clipboard
tags = fullscreen tags = fullscreen
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558 skip-if = toolkit == "gtk3" # disabled on Linux due to bug 513558
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_contextmenu_input.js] [browser_contextmenu_input.js]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # disabled on Linux due to bug 513558 skip-if = toolkit == "gtk3" # disabled on Linux due to bug 513558
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
[browser_ctrlTab.js] [browser_ctrlTab.js]
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

2
browser/base/content/test/plugins/browser.ini
Просмотреть файл

@ -54,7 +54,7 @@ tags = blocklist
[browser_clearplugindata.js] [browser_clearplugindata.js]
tags = blocklist tags = blocklist
[browser_CTP_context_menu.js] [browser_CTP_context_menu.js]
skip-if = toolkit == "gtk2" || toolkit == "gtk3" # fails intermittently on Linux (bug 909342) skip-if = toolkit == "gtk3" # fails intermittently on Linux (bug 909342)
tags = blocklist tags = blocklist
[browser_CTP_crashreporting.js] [browser_CTP_crashreporting.js]
skip-if = !crashreporter skip-if = !crashreporter

2
docshell/test/chrome/chrome.ini
Просмотреть файл

@ -69,8 +69,6 @@ skip-if = true # bug 1393441
[test_bug449780.xul] [test_bug449780.xul]
[test_bug453650.xul] [test_bug453650.xul]
[test_bug454235.xul] [test_bug454235.xul]
# bug 684176
skip-if = toolkit == "gtk2"
[test_bug456980.xul] [test_bug456980.xul]
[test_bug565388.xul] [test_bug565388.xul]
skip-if = os == 'linux' || os == 'mac' # Bug 1026815 skip-if = os == 'linux' || os == 'mac' # Bug 1026815

2
dom/ipc/tests/mochitest.ini
Просмотреть файл

@ -15,7 +15,7 @@ skip-if = e10s || toolkit == 'android'
[test_child_docshell.html] [test_child_docshell.html]
skip-if = toolkit == 'cocoa' || webrender # cocoa: disabled due to hangs, see changeset 6852e7c47edf, webrender: bug 1424752 skip-if = toolkit == 'cocoa' || webrender # cocoa: disabled due to hangs, see changeset 6852e7c47edf, webrender: bug 1424752
[test_CrashService_crash.html] [test_CrashService_crash.html]
skip-if = !(crashreporter && !e10s && (toolkit == 'gtk2' || toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows')) skip-if = !(crashreporter && !e10s && (toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows'))
[test_temporaryfile_stream.html] [test_temporaryfile_stream.html]
skip-if = !e10s skip-if = !e10s
support-files = support-files =

9
dom/plugins/test/mochitest/mochitest.ini
Просмотреть файл

@ -69,9 +69,9 @@ support-files = cocoa_focus.html
skip-if = toolkit != "cocoa" # Bug 1194534 skip-if = toolkit != "cocoa" # Bug 1194534
support-files = cocoa_window_focus.html support-files = cocoa_window_focus.html
[test_copyText.html] [test_copyText.html]
skip-if = (toolkit != "gtk2") && (toolkit != "gtk3") skip-if = toolkit != "gtk3"
[test_crash_nested_loop.html] [test_crash_nested_loop.html]
skip-if = (toolkit != "gtk2") && (toolkit != "gtk3") skip-if = toolkit != "gtk3"
[test_crashing.html] [test_crashing.html]
skip-if = !crashreporter skip-if = !crashreporter
[test_crashing2.html] [test_crashing2.html]
@ -106,9 +106,6 @@ skip-if = !crashreporter || e10s
skip-if = toolkit == 'android' # needs plugin support skip-if = toolkit == 'android' # needs plugin support
[test_painting.html] [test_painting.html]
skip-if = (toolkit == "cocoa" && e10s) # bug 1252230 skip-if = (toolkit == "cocoa" && e10s) # bug 1252230
[test_plugin_scroll_invalidation.html]
skip-if = toolkit != "gtk2"
support-files = plugin_scroll_invalidation.html
[test_plugin_scroll_painting.html] [test_plugin_scroll_painting.html]
skip-if = true # Bug 596491 skip-if = true # Bug 596491
[test_pluginstream_err.html] [test_pluginstream_err.html]
@ -147,5 +144,5 @@ skip-if = !(os == "win" && processor == "x86_64")
[test_windowless_ime.html] [test_windowless_ime.html]
skip-if = os != "win" skip-if = os != "win"
[test_x11_error_crash.html] [test_x11_error_crash.html]
skip-if = !crashreporter || e10s || ((toolkit != "gtk2") && (toolkit != "gtk3")) skip-if = !crashreporter || e10s || toolkit != "gtk3"
[test_zero_opacity.html] [test_zero_opacity.html]

60
dom/plugins/test/mochitest/plugin_scroll_invalidation.html
Просмотреть файл

@ -1,60 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test helper for plugin child widgets not being invalidated by scrolling</title>
<style>
body {
background: linear-gradient(red, black);
width: 200px;
height: 200px;
}
embed {
position:absolute;
}
embed#paint-waiter {
top: 0px;
left: 0px;
width: 0px;
height: 0px;
}
embed#e0 {
top: 70px;
left: 70px;
width: 10px;
height: 10px;
}
embed#e1 {
top: 60px;
left: 60px;
width: 10px;
height: 20px;
}
embed#e2 {
top: 60px;
left: 70px;
width: 20px;
height: 10px;
}
embed#e3 {
top: 70px;
left: 80px;
width: 10px;
height: 20px;
}
embed#e4 {
top: 80px;
left: 60px;
width: 20px;
height: 10px;
}
</style>
</head>
<body>
<embed id="paint-waiter" type="application/x-test" wmode="window">
<embed id="e0" type="application/x-test" wmode="window" class="scrolling"/>
<embed id="e1" type="application/x-test" wmode="window" class="scrolling"/>
<embed id="e2" type="application/x-test" wmode="window" class="scrolling"/>
<embed id="e3" type="application/x-test" wmode="window" class="scrolling"/>
<embed id="e4" type="application/x-test" wmode="window" class="scrolling"/>
</body>
</html>

2
layout/generic/test/mochitest.ini
Просмотреть файл

@ -111,7 +111,7 @@ skip-if = toolkit == 'android' || webrender # webrender: see bug 1424752
# Disable the caret movement by word test on Linux because the shortcut keys # Disable the caret movement by word test on Linux because the shortcut keys
# are defined in system level. So, it depends on the environment. # are defined in system level. So, it depends on the environment.
# Disable on Windows for too many intermittent failures (bug 916143). # Disable on Windows for too many intermittent failures (bug 916143).
skip-if = (toolkit == "gtk2") || (toolkit == "gtk3") || (os == "win") skip-if = (toolkit == "gtk3") || (os == "win")
[test_overflow_event.html] [test_overflow_event.html]
[test_page_scroll_with_fixed_pos.html] [test_page_scroll_with_fixed_pos.html]
support-files = page_scroll_with_fixed_pos_window.html support-files = page_scroll_with_fixed_pos_window.html

2
layout/reftests/forms/textarea/reftest.list
Просмотреть файл

@ -5,7 +5,7 @@ skip-if(Android) != ltr.html rtl.html
skip-if(Android) != ltr-scrollbar.html rtl-scrollbar.html skip-if(Android) != ltr-scrollbar.html rtl-scrollbar.html
skip-if(Android) != in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html skip-if(Android) != in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html
skip-if(Android) != ltr.html no-resize.html skip-if(Android) != ltr.html no-resize.html
skip-if(Android) fails-if(xulRuntime.widgetToolkit=="gtk2") != rtl.html no-resize.html # bug 834724 skip-if(Android) != rtl.html no-resize.html # bug 834724
fuzzy-if(skiaContent,1,1) == rtl.html rtl-dynamic-attr.html fuzzy-if(skiaContent,1,1) == rtl.html rtl-dynamic-attr.html
fuzzy-if(skiaContent,1,1) == rtl.html rtl-dynamic-style.html fuzzy-if(skiaContent,1,1) == rtl.html rtl-dynamic-style.html
== rtl.html in-dynamic-rtl-doc.html == rtl.html in-dynamic-rtl-doc.html

3
layout/tools/reftest/manifest.jsm
Просмотреть файл

@ -490,8 +490,7 @@ function BuildConditionSandbox(aURL) {
// Shortcuts for widget toolkits. // Shortcuts for widget toolkits.
sandbox.Android = xr.OS == "Android"; sandbox.Android = xr.OS == "Android";
sandbox.cocoaWidget = xr.widgetToolkit == "cocoa"; sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
sandbox.gtkWidget = xr.widgetToolkit == "gtk2" sandbox.gtkWidget = xr.widgetToolkit == "gtk3";
|| xr.widgetToolkit == "gtk3";
sandbox.qtWidget = xr.widgetToolkit == "qt"; sandbox.qtWidget = xr.widgetToolkit == "qt";
sandbox.winWidget = xr.widgetToolkit == "windows"; sandbox.winWidget = xr.widgetToolkit == "windows";

20
python/mozbuild/mozbuild/test/test_mozinfo.py
Просмотреть файл

@ -58,21 +58,21 @@ class TestBuildDict(unittest.TestCase, Base):
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='i386', TARGET_CPU='i386',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
))) )))
self.assertEqual('linux', d['os']) self.assertEqual('linux', d['os'])
self.assertEqual('x86', d['processor']) self.assertEqual('x86', d['processor'])
self.assertEqual('gtk2', d['toolkit']) self.assertEqual('gtk3', d['toolkit'])
self.assertEqual(32, d['bits']) self.assertEqual(32, d['bits'])
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='x86_64', TARGET_CPU='x86_64',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
))) )))
self.assertEqual('linux', d['os']) self.assertEqual('linux', d['os'])
self.assertEqual('x86_64', d['processor']) self.assertEqual('x86_64', d['processor'])
self.assertEqual('gtk2', d['toolkit']) self.assertEqual('gtk3', d['toolkit'])
self.assertEqual(64, d['bits']) self.assertEqual(64, d['bits'])
def test_mac(self): def test_mac(self):
@ -132,14 +132,14 @@ class TestBuildDict(unittest.TestCase, Base):
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='arm', TARGET_CPU='arm',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
))) )))
self.assertEqual('arm', d['processor']) self.assertEqual('arm', d['processor'])
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='armv7', TARGET_CPU='armv7',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
))) )))
self.assertEqual('arm', d['processor']) self.assertEqual('arm', d['processor'])
@ -165,14 +165,14 @@ class TestBuildDict(unittest.TestCase, Base):
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='i386', TARGET_CPU='i386',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
))) )))
self.assertEqual(False, d['debug']) self.assertEqual(False, d['debug'])
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='i386', TARGET_CPU='i386',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
MOZ_DEBUG='1', MOZ_DEBUG='1',
))) )))
self.assertEqual(True, d['debug']) self.assertEqual(True, d['debug'])
@ -184,14 +184,14 @@ class TestBuildDict(unittest.TestCase, Base):
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='i386', TARGET_CPU='i386',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
))) )))
self.assertEqual(False, d['crashreporter']) self.assertEqual(False, d['crashreporter'])
d = build_dict(self._config(dict( d = build_dict(self._config(dict(
OS_TARGET='Linux', OS_TARGET='Linux',
TARGET_CPU='i386', TARGET_CPU='i386',
MOZ_WIDGET_TOOLKIT='gtk2', MOZ_WIDGET_TOOLKIT='gtk3',
MOZ_CRASHREPORTER='1', MOZ_CRASHREPORTER='1',
))) )))
self.assertEqual(True, d['crashreporter']) self.assertEqual(True, d['crashreporter'])

2
testing/mozbase/manifestparser/tests/test_testmanifest.py
Просмотреть файл

@ -34,7 +34,7 @@ class TestTestManifest(unittest.TestCase):
['fleem']) ['fleem'])
# You should be able to expect failures: # You should be able to expect failures:
last = manifest.active_tests(exists=False, toolkit='gtk2')[-1] last = manifest.active_tests(exists=False, toolkit='gtk3')[-1]
self.assertEqual(last['name'], 'linuxtest') self.assertEqual(last['name'], 'linuxtest')
self.assertEqual(last['expected'], 'pass') self.assertEqual(last['expected'], 'pass')
last = manifest.active_tests(exists=False, toolkit='cocoa')[-1] last = manifest.active_tests(exists=False, toolkit='cocoa')[-1]

2
widget/headless/tests/xpcshell.ini
Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT] [DEFAULT]
skip-if = toolkit != "gtk2" && toolkit != "gtk3" && toolkit != "windows" skip-if = toolkit != "gtk3" && toolkit != "windows"
headless = true headless = true
[test_headless_clipboard.js] [test_headless_clipboard.js]