Mercurial > mozilla-central / changeset / d152d55d4a43db18f743d1acb823b156d4439cb3
summary | shortlog | changelog | pushlog | graph | tags | bookmarks | branches | files | changeset | raw | zip | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug 556686 - [Debug Windows SeaMonkey 2.1] mochitest-chrome: layout/base/tests/chrome/test_bug396024.xul, /test_bug482976.xul and test_printpreview.xul time out; (Av1) Bug 501100 follow-up: s/DIRS/PARALLEL_DIRS/, Clean up remnant comment, Rename them to test_printpreview*.xul.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 13 Apr 2010 06:04:48 +0200
changeset 40729 d152d55d4a43db18f743d1acb823b156d4439cb3
parent 40728 104d6c3afe51eb42fa37fd028908e8530657eb32
child 40730 82c37c003465753eaff70b464cdd1a291b309d58
push id12777
push usersgautherie.bz@free.fr
push dateTue, 13 Apr 2010 04:05:50 +0000
treeherdermozilla-central@d152d55d4a43 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs556686, 396024, 482976, 501100
milestone1.9.3a5pre
first release with
nightly linux32
caa4eb12ad20 / 3.7a5pre / 20100413031157 / files
nightly linux64
caa4eb12ad20 / 3.7a5pre / 20100413030621 / files
nightly mac
caa4eb12ad20 / 3.7a5pre / 20100413030754 / files
nightly win32
caa4eb12ad20 / 3.7a5pre / 20100413040241 / files
nightly win64
5f85f8f99743 / 3.7a5pre / 20100528110451 / files
last release without
nightly linux32
201589e94d3b / 3.7a5pre / 20100412031225 / files
nightly linux64
201589e94d3b / 3.7a5pre / 20100412030616 / files
nightly mac
201589e94d3b / 3.7a5pre / 20100412030824 / files
nightly win32
201589e94d3b / 3.7a5pre / 20100412040827 / files
Bug 556686 - [Debug Windows SeaMonkey 2.1] mochitest-chrome: layout/base/tests/chrome/test_bug396024.xul, /test_bug482976.xul and test_printpreview.xul time out; (Av1) Bug 501100 follow-up: s/DIRS/PARALLEL_DIRS/, Clean up remnant comment, Rename them to test_printpreview*.xul. r=roc. Bug 501100 - Print preview mochitests should be chrome tests
layout/base/tests/Makefile.in file | annotate | diff | comparison | revisions
layout/base/tests/chrome/Makefile.in file | annotate | diff | comparison | revisions
layout/base/tests/chrome/bug396024_helper.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/bug482976_helper.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/printpreview_bug396024_helper.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/printpreview_bug482976_helper.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/test_bug396024.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/test_bug482976.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/test_printpreview_bug396024.xul file | annotate | diff | comparison | revisions
layout/base/tests/chrome/test_printpreview_bug482976.xul file | annotate | diff | comparison | revisions 
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -38,33 +38,32 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir	= layout/base/tests
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS += \
+PARALLEL_DIRS += \
   chrome \
   $(NULL)
 
 # We can't use CPP_UNIT_TESTS for TestPoisonArea because libxpcom
 # (which it does not need) isn't available at this point in the build.
 
 BARE_UNIT_TESTS = \
 		TestPoisonArea.cpp \
 		$(NULL)
 
 CPPSRCS += $(BARE_UNIT_TESTS)
 SIMPLE_PROGRAMS += $(BARE_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
-
 DEFINES += -D_IMPL_NS_LAYOUT
 
 _TEST_FILES =	\
 		bug369950-subframe.xml \
 		bug495648.rdf \
 		decoration_line_rendering.js \
 		region_lib.js \
 		scrolling_helper.html \
@@ -104,19 +103,16 @@ DEFINES += -D_IMPL_NS_LAYOUT
 		     bug512295-2-ref.html \
 		test_bug514127.html \
 		test_bug518777.html \
 		test_bug548545.xhtml \
 		test_flush_on_paint.html \
 		test_scroll_selection_into_view.html \
 		test_scrolling.html \
 		$(NULL)
-# test_bug396024.html is currently disabled because it interacts badly with
-# the "You can't print-preview while the page is loading" dialog.
-# (See bug 407080)
 
 # Tests for bugs 441782 and 467672 don't pass reliably on Windows, because of bug 469208
 ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 _TEST_FILES += \
 		bidi_numeral_test.js \
 		test_bug332655-1.html \
 		test_bug332655-2.html \
 		test_bug441782-1a.html \
--- a/layout/base/tests/chrome/Makefile.in
+++ b/layout/base/tests/chrome/Makefile.in
@@ -39,25 +39,25 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 relativesrcdir  = layout/base/test/chrome
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES = \
-	test_bug396024.xul \
-	bug396024_helper.xul \
 	test_bug396367-1.html \
 	test_bug396367-2.html \
-	test_bug482976.xul \
-	bug482976_helper.xul \
 	test_bug504311.xul \
 	test_bug514660.xul \
+	test_bug533845.xul \
+	test_chrome_content_integration.xul \
+	     chrome_content_integration_window.xul \
 	test_printpreview.xul \
-	printpreview_helper.xul \
-	test_bug533845.xul \
-	chrome_content_integration_window.xul \
-	test_chrome_content_integration.xul \
+	     printpreview_helper.xul \
+	test_printpreview_bug396024.xul \
+	     printpreview_bug396024_helper.xul \
+	test_printpreview_bug482976.xul \
+	     printpreview_bug482976_helper.xul \
     $(NULL)
 
 libs:: $(_CHROME_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
rename from layout/base/tests/chrome/bug396024_helper.xul
rename to layout/base/tests/chrome/printpreview_bug396024_helper.xul
rename from layout/base/tests/chrome/bug482976_helper.xul
rename to layout/base/tests/chrome/printpreview_bug482976_helper.xul
rename from layout/base/tests/chrome/test_bug396024.xul
rename to layout/base/tests/chrome/test_printpreview_bug396024.xul
--- a/layout/base/tests/chrome/test_bug396024.xul
+++ b/layout/base/tests/chrome/test_printpreview_bug396024.xul
@@ -14,11 +14,11 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body xmlns="http://www.w3.org/1999/xhtml">
 <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=396024"
    target="_blank">Mozilla Bug 396024</a>
 </body>
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
-window.open("bug396024_helper.xul", "bug396024", "chrome,width=100,height=100");
+window.open("printpreview_bug396024_helper.xul", "bug396024", "chrome,width=100,height=100");
 ]]></script>
 </window>
rename from layout/base/tests/chrome/test_bug482976.xul
rename to layout/base/tests/chrome/test_printpreview_bug482976.xul
--- a/layout/base/tests/chrome/test_bug482976.xul
+++ b/layout/base/tests/chrome/test_printpreview_bug482976.xul
@@ -14,11 +14,11 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body xmlns="http://www.w3.org/1999/xhtml">
 <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=482976"
    target="_blank">Mozilla Bug 482976</a>
 </body>
   <!-- test code goes here -->
 <script type="application/javascript">
 <![CDATA[
 SimpleTest.waitForExplicitFinish();
-window.open("bug482976_helper.xul", "bug482976", "chrome,width=100,height=100");
+window.open("printpreview_bug482976_helper.xul", "bug482976", "chrome,width=100,height=100");
 ]]></script>
 </window>
mozilla-central
Deployed from e404c980045c at 2021-03-01T18:43:47Z.