diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 6c154de340c2..0c05c6a9e6b3 100644 --- a/browser/base/content/test/general/browser.ini +++ b/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] subsuite = clipboard 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. [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. [browser_ctrlTab.js] # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD. diff --git a/browser/base/content/test/plugins/browser.ini b/browser/base/content/test/plugins/browser.ini index 15017bcfc155..f98f5755b9cf 100644 --- a/browser/base/content/test/plugins/browser.ini +++ b/browser/base/content/test/plugins/browser.ini @@ -54,7 +54,7 @@ tags = blocklist [browser_clearplugindata.js] tags = blocklist [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 [browser_CTP_crashreporting.js] skip-if = !crashreporter diff --git a/docshell/test/chrome/chrome.ini b/docshell/test/chrome/chrome.ini index 2c07cffc67ff..b42aae438ed8 100644 --- a/docshell/test/chrome/chrome.ini +++ b/docshell/test/chrome/chrome.ini @@ -69,8 +69,6 @@ skip-if = true # bug 1393441 [test_bug449780.xul] [test_bug453650.xul] [test_bug454235.xul] -# bug 684176 -skip-if = toolkit == "gtk2" [test_bug456980.xul] [test_bug565388.xul] skip-if = os == 'linux' || os == 'mac' # Bug 1026815 diff --git a/dom/ipc/tests/mochitest.ini b/dom/ipc/tests/mochitest.ini index 23ac9317d572..5c51b952b2f0 100644 --- a/dom/ipc/tests/mochitest.ini +++ b/dom/ipc/tests/mochitest.ini @@ -15,7 +15,7 @@ skip-if = e10s || toolkit == 'android' [test_child_docshell.html] skip-if = toolkit == 'cocoa' || webrender # cocoa: disabled due to hangs, see changeset 6852e7c47edf, webrender: bug 1424752 [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] skip-if = !e10s support-files = diff --git a/dom/plugins/test/mochitest/mochitest.ini b/dom/plugins/test/mochitest/mochitest.ini index c86ca9661bb3..4598845f27e4 100644 --- a/dom/plugins/test/mochitest/mochitest.ini +++ b/dom/plugins/test/mochitest/mochitest.ini @@ -69,9 +69,9 @@ support-files = cocoa_focus.html skip-if = toolkit != "cocoa" # Bug 1194534 support-files = cocoa_window_focus.html [test_copyText.html] -skip-if = (toolkit != "gtk2") && (toolkit != "gtk3") +skip-if = toolkit != "gtk3" [test_crash_nested_loop.html] -skip-if = (toolkit != "gtk2") && (toolkit != "gtk3") +skip-if = toolkit != "gtk3" [test_crashing.html] skip-if = !crashreporter [test_crashing2.html] @@ -106,9 +106,6 @@ skip-if = !crashreporter || e10s skip-if = toolkit == 'android' # needs plugin support [test_painting.html] 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] skip-if = true # Bug 596491 [test_pluginstream_err.html] @@ -147,5 +144,5 @@ skip-if = !(os == "win" && processor == "x86_64") [test_windowless_ime.html] skip-if = os != "win" [test_x11_error_crash.html] -skip-if = !crashreporter || e10s || ((toolkit != "gtk2") && (toolkit != "gtk3")) +skip-if = !crashreporter || e10s || toolkit != "gtk3" [test_zero_opacity.html] diff --git a/dom/plugins/test/mochitest/plugin_scroll_invalidation.html b/dom/plugins/test/mochitest/plugin_scroll_invalidation.html deleted file mode 100644 index 74a68ff4acac..000000000000 --- a/dom/plugins/test/mochitest/plugin_scroll_invalidation.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - Test helper for plugin child widgets not being invalidated by scrolling - - - - - - - - - - - diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini index 408b1cb44dff..a5a2e67798fe 100644 --- a/layout/generic/test/mochitest.ini +++ b/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 # are defined in system level. So, it depends on the environment. # 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_page_scroll_with_fixed_pos.html] support-files = page_scroll_with_fixed_pos_window.html diff --git a/layout/reftests/forms/textarea/reftest.list b/layout/reftests/forms/textarea/reftest.list index b05605579916..85e32de05f67 100644 --- a/layout/reftests/forms/textarea/reftest.list +++ b/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) != in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.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-style.html == rtl.html in-dynamic-rtl-doc.html diff --git a/layout/tools/reftest/manifest.jsm b/layout/tools/reftest/manifest.jsm index ece393e9d19c..c27535e97ad2 100644 --- a/layout/tools/reftest/manifest.jsm +++ b/layout/tools/reftest/manifest.jsm @@ -490,8 +490,7 @@ function BuildConditionSandbox(aURL) { // Shortcuts for widget toolkits. sandbox.Android = xr.OS == "Android"; sandbox.cocoaWidget = xr.widgetToolkit == "cocoa"; - sandbox.gtkWidget = xr.widgetToolkit == "gtk2" - || xr.widgetToolkit == "gtk3"; + sandbox.gtkWidget = xr.widgetToolkit == "gtk3"; sandbox.qtWidget = xr.widgetToolkit == "qt"; sandbox.winWidget = xr.widgetToolkit == "windows"; diff --git a/python/mozbuild/mozbuild/test/test_mozinfo.py b/python/mozbuild/mozbuild/test/test_mozinfo.py index 7d017a2981e2..6ae3da566ec4 100755 --- a/python/mozbuild/mozbuild/test/test_mozinfo.py +++ b/python/mozbuild/mozbuild/test/test_mozinfo.py @@ -58,21 +58,21 @@ class TestBuildDict(unittest.TestCase, Base): d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='i386', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', ))) self.assertEqual('linux', d['os']) self.assertEqual('x86', d['processor']) - self.assertEqual('gtk2', d['toolkit']) + self.assertEqual('gtk3', d['toolkit']) self.assertEqual(32, d['bits']) d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='x86_64', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', ))) self.assertEqual('linux', d['os']) self.assertEqual('x86_64', d['processor']) - self.assertEqual('gtk2', d['toolkit']) + self.assertEqual('gtk3', d['toolkit']) self.assertEqual(64, d['bits']) def test_mac(self): @@ -132,14 +132,14 @@ class TestBuildDict(unittest.TestCase, Base): d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='arm', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', ))) self.assertEqual('arm', d['processor']) d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='armv7', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', ))) self.assertEqual('arm', d['processor']) @@ -165,14 +165,14 @@ class TestBuildDict(unittest.TestCase, Base): d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='i386', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', ))) self.assertEqual(False, d['debug']) d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='i386', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', MOZ_DEBUG='1', ))) self.assertEqual(True, d['debug']) @@ -184,14 +184,14 @@ class TestBuildDict(unittest.TestCase, Base): d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='i386', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', ))) self.assertEqual(False, d['crashreporter']) d = build_dict(self._config(dict( OS_TARGET='Linux', TARGET_CPU='i386', - MOZ_WIDGET_TOOLKIT='gtk2', + MOZ_WIDGET_TOOLKIT='gtk3', MOZ_CRASHREPORTER='1', ))) self.assertEqual(True, d['crashreporter']) diff --git a/testing/mozbase/manifestparser/tests/test_testmanifest.py b/testing/mozbase/manifestparser/tests/test_testmanifest.py index d47d6d085648..413901cb003e 100644 --- a/testing/mozbase/manifestparser/tests/test_testmanifest.py +++ b/testing/mozbase/manifestparser/tests/test_testmanifest.py @@ -34,7 +34,7 @@ class TestTestManifest(unittest.TestCase): ['fleem']) # 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['expected'], 'pass') last = manifest.active_tests(exists=False, toolkit='cocoa')[-1] diff --git a/widget/headless/tests/xpcshell.ini b/widget/headless/tests/xpcshell.ini index e756ff0611aa..3b29227779ad 100644 --- a/widget/headless/tests/xpcshell.ini +++ b/widget/headless/tests/xpcshell.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = toolkit != "gtk2" && toolkit != "gtk3" && toolkit != "windows" +skip-if = toolkit != "gtk3" && toolkit != "windows" headless = true [test_headless_clipboard.js]