From 2607b35af14ce1126c4a5b59c53eb27303eb2c6f Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Sat, 25 Jun 2011 13:42:23 -0400 Subject: [PATCH] Bug 663844 - move layout/generic/test/*.xul to mochitest-chrome. r=ted, a=test-only --- layout/generic/test/Makefile.in | 172 +++++++++--------- layout/generic/test/test_backspace_delete.xul | 8 +- layout/generic/test/test_bug469613.xul | 10 +- layout/generic/test/test_bug469774.xul | 9 +- layout/generic/test/test_bug508115.xul | 8 +- layout/generic/test/test_bug632379.xul | 8 +- 6 files changed, 105 insertions(+), 110 deletions(-) diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in index ba253f4a6d7b..cc9e83302e87 100644 --- a/layout/generic/test/Makefile.in +++ b/layout/generic/test/Makefile.in @@ -47,94 +47,94 @@ include $(topsrcdir)/config/rules.mk # in the list below, we make sure that the tests that require focus # run before test_plugin_clipping, which can steal focus for its window. _TEST_FILES = \ - bug344830_testembed.svg \ - frame_selection_underline.xhtml \ - frame_selection_underline-ref.xhtml \ - frame_selection_underline.css \ - plugin_clipping_helper.xhtml \ - plugin_clipping_helper2.xhtml \ - plugin_clipping_helper_transformed.xhtml \ - plugin_clipping_helper_table.xhtml \ - plugin_clipping_lib.js \ - plugin_focus_helper.html \ - test_backspace_delete.xul \ - test_bug240933.html \ - test_bug263683.html \ - test_bug288789.html \ - test_bug290397.html \ - test_bug323656.html \ - test_bug344830.html \ - test_bug348681.html \ - test_bug382429.html \ - test_bug384527.html \ - test_bug385751.html \ - test_bug389630.html \ - test_bug391747.html \ - test_bug392746.html \ - test_bug392923.html \ - test_bug394173.html \ - test_bug394239.html \ - test_bug402380.html \ - test_bug404872.html \ - test_bug405178.html \ - test_bug416168.html \ - test_bug421436.html \ - $(warning test_bug421839-1.html disabled because it calls finish twice which can cause timeouts) \ - test_bug421839-2.html \ - bug421839-2-page.html \ - test_bug424627.html \ - test_bug438840.html \ - test_bug448860.html \ - test_bug460532.html \ - test_bug468167.html \ - test_bug469613.xul \ - test_bug469774.xul \ - test_bug470212.html \ - $(warning test_bug488417.html temporarily disabled - see bug 489560) \ - test_bug496275.html \ - test_bug503813.html \ - test_bug508115.xul \ - $(warning test_bug507902.html temporarily disabled - see bug 510001) \ - test_bug514732.html \ - test_bug527306.html \ - test_bug579767.html \ - test_bug597333.html \ - test_image_selection.html \ - test_invalidate_during_plugin_paint.html \ - test_movement_by_characters.html \ - test_movement_by_words.html \ - test_plugin_clipping.xhtml \ - test_plugin_clipping2.xhtml \ - test_plugin_clipping_transformed.xhtml \ - test_plugin_clipping_table.xhtml \ - test_plugin_focus.html \ - test_plugin_mouse_coords.html \ - test_plugin_position.xhtml \ - test_selection_expanding.html \ - selection_expanding_xbl.xml \ - test_selection_underline.html \ - file_BrokenImageReference.png \ - file_Dolske.png \ - file_IconTestServer.sjs \ - file_LoadingImageReference.png \ - file_bug514732_1.html \ - file_bug514732_helper.html \ - file_bug579767_1.html \ - file_bug579767_2.html \ - test_bug522632.html \ - test_bug589621.html \ - test_bug589623.html \ - test_bug632379.xul \ - test_bug633762.html \ - bug633762_iframe.html \ - $(srcdir)/../../reftests/backgrounds/blue-32x32.png \ - $(srcdir)/../../reftests/backgrounds/fuchsia-32x32.png \ - $(NULL) + bug344830_testembed.svg \ + frame_selection_underline.xhtml \ + frame_selection_underline-ref.xhtml \ + frame_selection_underline.css \ + plugin_clipping_helper.xhtml \ + plugin_clipping_helper2.xhtml \ + plugin_clipping_helper_transformed.xhtml \ + plugin_clipping_helper_table.xhtml \ + plugin_clipping_lib.js \ + plugin_focus_helper.html \ + test_bug240933.html \ + test_bug263683.html \ + test_bug288789.html \ + test_bug290397.html \ + test_bug323656.html \ + test_bug344830.html \ + test_bug348681.html \ + test_bug382429.html \ + test_bug384527.html \ + test_bug385751.html \ + test_bug389630.html \ + test_bug391747.html \ + test_bug392746.html \ + test_bug392923.html \ + test_bug394173.html \ + test_bug394239.html \ + test_bug402380.html \ + test_bug404872.html \ + test_bug405178.html \ + test_bug416168.html \ + test_bug421436.html \ + $(warning test_bug421839-1.html disabled because it calls finish twice which can cause timeouts) \ + test_bug421839-2.html \ + bug421839-2-page.html \ + test_bug424627.html \ + test_bug438840.html \ + test_bug448860.html \ + test_bug460532.html \ + test_bug468167.html \ + test_bug470212.html \ + $(warning test_bug488417.html temporarily disabled - see bug 489560) \ + test_bug496275.html \ + test_bug503813.html \ + $(warning test_bug507902.html temporarily disabled - see bug 510001) \ + test_bug514732.html \ + test_bug527306.html \ + test_bug579767.html \ + test_bug597333.html \ + test_image_selection.html \ + test_invalidate_during_plugin_paint.html \ + test_movement_by_characters.html \ + test_movement_by_words.html \ + test_plugin_clipping.xhtml \ + test_plugin_clipping2.xhtml \ + test_plugin_clipping_transformed.xhtml \ + test_plugin_clipping_table.xhtml \ + test_plugin_focus.html \ + test_plugin_mouse_coords.html \ + test_plugin_position.xhtml \ + test_selection_expanding.html \ + selection_expanding_xbl.xml \ + test_selection_underline.html \ + file_BrokenImageReference.png \ + file_Dolske.png \ + file_IconTestServer.sjs \ + file_LoadingImageReference.png \ + file_bug514732_1.html \ + file_bug514732_helper.html \ + file_bug579767_1.html \ + file_bug579767_2.html \ + test_bug522632.html \ + test_bug589621.html \ + test_bug589623.html \ + test_bug633762.html \ + bug633762_iframe.html \ + $(srcdir)/../../reftests/backgrounds/blue-32x32.png \ + $(srcdir)/../../reftests/backgrounds/fuchsia-32x32.png \ + $(NULL) _CHROME_FILES = \ - test_bug514732-2.xul \ - file_bug514732_window.xul \ - $(NULL) + test_bug632379.xul \ + test_bug508115.xul \ + test_bug469613.xul \ + test_bug469774.xul \ + test_backspace_delete.xul \ + test_bug514732-2.xul \ + file_bug514732_window.xul \ + $(NULL) libs:: $(_TEST_FILES) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/layout/generic/test/test_backspace_delete.xul b/layout/generic/test/test_backspace_delete.xul index 8806b5d43255..8966dd5a71bc 100644 --- a/layout/generic/test/test_backspace_delete.xul +++ b/layout/generic/test/test_backspace_delete.xul @@ -1,11 +1,11 @@ - + - - + + + @@ -34,7 +34,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=469774 // Like snapshotWindow, but with DRAWWINDOW_DRAW_CARET function snapShot() { - netscape.security.PrivilegeManager.enablePrivilege('UniversalBrowserRead'); var canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas"); canvas.setAttribute("width", 200); canvas.setAttribute("height", 50); diff --git a/layout/generic/test/test_bug508115.xul b/layout/generic/test/test_bug508115.xul index 310a390ff70e..78792d6420c8 100644 --- a/layout/generic/test/test_bug508115.xul +++ b/layout/generic/test/test_bug508115.xul @@ -1,6 +1,6 @@ - + @@ -10,9 +10,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=508115 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> Test for Bug 508115 - +