From 9ba59becc7b8a8cde49dbfd67177599bd331003c Mon Sep 17 00:00:00 2001 From: Joel Maher Date: Thu, 9 Jun 2011 11:10:12 -0400 Subject: [PATCH] Bug 659263 - move content/xul/*.xul tests from mochitest-plain to mochitest-chrome. r=bzbarsky, a=test-only --HG-- rename : content/xul/templates/tests/bug441785-1.rdf => content/xul/templates/tests/chrome/bug441785-1.rdf rename : content/xul/templates/tests/bug441785-2.rdf => content/xul/templates/tests/chrome/bug441785-2.rdf rename : content/xul/templates/tests/test_bug441785.xul => content/xul/templates/tests/chrome/test_bug441785.xul rename : content/xul/templates/tests/test_sortservice.xul => content/xul/templates/tests/chrome/test_sortservice.xul --- content/xul/content/test/Makefile.in | 7 ++++--- content/xul/content/test/test_bug233643.xul | 6 +++--- content/xul/content/test/test_bug330705-2.xul | 6 +++--- content/xul/document/test/Makefile.in | 10 ++-------- content/xul/document/test/test_bug199692.xul | 6 +++--- content/xul/document/test/test_bug311681.xul | 6 +++--- content/xul/document/test/test_bug335375.xul | 2 +- content/xul/document/test/test_bug391002.xul | 6 +++--- content/xul/document/test/test_bug403868.xul | 6 +++--- content/xul/document/test/test_bug414907.xul | 6 +++--- content/xul/document/test/test_bug418216.xul | 6 +++--- content/xul/document/test/test_bug445177.xul | 6 +++--- content/xul/document/test/test_bug449457.xul | 6 +++--- content/xul/document/test/test_bug468176.xul | 6 +++--- content/xul/templates/tests/Makefile.in | 9 --------- content/xul/templates/tests/chrome/Makefile.in | 4 ++++ .../xul/templates/tests/{ => chrome}/bug441785-1.rdf | 0 .../xul/templates/tests/{ => chrome}/bug441785-2.rdf | 0 .../templates/tests/{ => chrome}/test_bug441785.xul | 6 +++--- .../templates/tests/{ => chrome}/test_sortservice.xul | 6 +++--- 20 files changed, 50 insertions(+), 60 deletions(-) rename content/xul/templates/tests/{ => chrome}/bug441785-1.rdf (100%) rename content/xul/templates/tests/{ => chrome}/bug441785-2.rdf (100%) rename content/xul/templates/tests/{ => chrome}/test_bug441785.xul (94%) rename content/xul/templates/tests/{ => chrome}/test_sortservice.xul (88%) diff --git a/content/xul/content/test/Makefile.in b/content/xul/content/test/Makefile.in index 41103231531..2057ea8c5ff 100644 --- a/content/xul/content/test/Makefile.in +++ b/content/xul/content/test/Makefile.in @@ -44,12 +44,13 @@ relativesrcdir = content/xul/content/test include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -_TEST_FILES = test_bug330705-2.xul \ - test_bug233643.xul \ +_TEST_FILES = \ test_bug486990.xul \ $(NULL) - + _CHROME_FILES = \ + test_bug330705-2.xul \ + test_bug233643.xul \ test_bug398289.html \ 398289-resource.xul \ $(NULL) diff --git a/content/xul/content/test/test_bug233643.xul b/content/xul/content/test/test_bug233643.xul index 2ce7be6f4c2..c6be63b50af 100644 --- a/content/xul/content/test/test_bug233643.xul +++ b/content/xul/content/test/test_bug233643.xul @@ -1,14 +1,14 @@ - + title="Test for Bug 233643"> - - + + diff --git a/content/xul/content/test/test_bug330705-2.xul b/content/xul/content/test/test_bug330705-2.xul index 38e455313cf..a7f25a5fc72 100644 --- a/content/xul/content/test/test_bug330705-2.xul +++ b/content/xul/content/test/test_bug330705-2.xul @@ -1,13 +1,13 @@  - + - - + + Mozilla Bug 330705

diff --git a/content/xul/document/test/Makefile.in b/content/xul/document/test/Makefile.in index 1dcd6a3d174..c2c85936dfe 100644 --- a/content/xul/document/test/Makefile.in +++ b/content/xul/document/test/Makefile.in @@ -44,7 +44,7 @@ relativesrcdir = content/xul/document/test include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk -_TEST_FILES = \ +_CHROME_FILES = \ test_bug311681.xul \ test_bug199692.xul \ test_bug391002.xul \ @@ -54,20 +54,14 @@ _TEST_FILES = \ test_bug445177.xul \ test_bug449457.xul \ test_bug468176.xul \ - $(NULL) - -_CHROME_FILES = \ test_bug583948.xul \ window_bug583948.xul \ test_bug497875.xul \ - bug497875-iframe.xul \ + bug497875-iframe.xul \ test_bug335375.xul \ overlay1_bug335375.xul \ overlay2_bug335375.xul \ $(NULL) -libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) - libs:: $(_CHROME_FILES) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/xul/document/test/test_bug199692.xul b/content/xul/document/test/test_bug199692.xul index 0c557098fa4..3d0438ced2a 100644 --- a/content/xul/document/test/test_bug199692.xul +++ b/content/xul/document/test/test_bug199692.xul @@ -1,6 +1,6 @@ - + @@ -10,8 +10,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=199692 xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - + + diff --git a/content/xul/document/test/test_bug311681.xul b/content/xul/document/test/test_bug311681.xul index dc03e16b860..57e4a1ee2d3 100644 --- a/content/xul/document/test/test_bug311681.xul +++ b/content/xul/document/test/test_bug311681.xul @@ -1,6 +1,6 @@ - + @@ -9,8 +9,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=311681 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> Test for Bug 311681 - - + + Mozilla Bug 311681 diff --git a/content/xul/document/test/test_bug335375.xul b/content/xul/document/test/test_bug335375.xul index a46ad0f7f87..d562bafd9a1 100644 --- a/content/xul/document/test/test_bug335375.xul +++ b/content/xul/document/test/test_bug335375.xul @@ -1,6 +1,6 @@ - + - - + + Mozilla Bug 445177 diff --git a/content/xul/document/test/test_bug449457.xul b/content/xul/document/test/test_bug449457.xul index 3424718a78a..0f5fde59124 100644 --- a/content/xul/document/test/test_bug449457.xul +++ b/content/xul/document/test/test_bug449457.xul @@ -1,13 +1,13 @@ - + - - + + Mozilla Bug 468176 diff --git a/content/xul/templates/tests/Makefile.in b/content/xul/templates/tests/Makefile.in index 4df3df192ab..be5187c262e 100644 --- a/content/xul/templates/tests/Makefile.in +++ b/content/xul/templates/tests/Makefile.in @@ -45,14 +45,5 @@ include $(DEPTH)/config/autoconf.mk DIRS = chrome -_TEST_FILES = \ - test_bug441785.xul \ - bug441785-1.rdf \ - bug441785-2.rdf \ - test_sortservice.xul \ - $(NULL) - include $(topsrcdir)/config/rules.mk -libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/xul/templates/tests/chrome/Makefile.in b/content/xul/templates/tests/chrome/Makefile.in index 4de40de98bb..a46c2998178 100644 --- a/content/xul/templates/tests/chrome/Makefile.in +++ b/content/xul/templates/tests/chrome/Makefile.in @@ -259,6 +259,10 @@ _TEST_FILES = \ test_tmpl_invalidqp.xul \ test_tmpl_errors.xul \ test_tmpl_regenerate.xul \ + test_bug441785.xul \ + bug441785-1.rdf \ + bug441785-2.rdf \ + test_sortservice.xul \ $(NULL) libs:: $(_TEST_FILES) diff --git a/content/xul/templates/tests/bug441785-1.rdf b/content/xul/templates/tests/chrome/bug441785-1.rdf similarity index 100% rename from content/xul/templates/tests/bug441785-1.rdf rename to content/xul/templates/tests/chrome/bug441785-1.rdf diff --git a/content/xul/templates/tests/bug441785-2.rdf b/content/xul/templates/tests/chrome/bug441785-2.rdf similarity index 100% rename from content/xul/templates/tests/bug441785-2.rdf rename to content/xul/templates/tests/chrome/bug441785-2.rdf diff --git a/content/xul/templates/tests/test_bug441785.xul b/content/xul/templates/tests/chrome/test_bug441785.xul similarity index 94% rename from content/xul/templates/tests/test_bug441785.xul rename to content/xul/templates/tests/chrome/test_bug441785.xul index 05719c5f68a..45d1cabbcba 100644 --- a/content/xul/templates/tests/test_bug441785.xul +++ b/content/xul/templates/tests/chrome/test_bug441785.xul @@ -1,6 +1,6 @@ - + @@ -40,8 +40,8 @@ - - + + - + +