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

--HG--
rename : layout/base/tests/chrome/bug396024_helper.xul => layout/base/tests/chrome/printpreview_bug396024_helper.xul
rename : layout/base/tests/chrome/bug482976_helper.xul => layout/base/tests/chrome/printpreview_bug482976_helper.xul
rename : layout/base/tests/chrome/test_bug396024.xul => layout/base/tests/chrome/test_printpreview_bug396024.xul
rename : layout/base/tests/chrome/test_bug482976.xul => layout/base/tests/chrome/test_printpreview_bug482976.xul

layout/base/tests/Makefile.in

@@ -43,7 +43,7 @@ relativesrcdir	= layout/base/tests
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS += \
+PARALLEL_DIRS += \
   chrome \
   $(NULL)
 
@@ -59,7 +59,6 @@ SIMPLE_PROGRAMS += $(BARE_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
-
 DEFINES += -D_IMPL_NS_LAYOUT
 
 _TEST_FILES =	\
@@ -109,9 +108,6 @@ _TEST_FILES =	\
 		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)))

layout/base/tests/chrome/Makefile.in

@@ -44,19 +44,19 @@ 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_printpreview.xul \
-	printpreview_helper.xul \
 	test_bug533845.xul \
-	chrome_content_integration_window.xul \
 	test_chrome_content_integration.xul \
+	     chrome_content_integration_window.xul \
+	test_printpreview.xul \
+	     printpreview_helper.xul \
+	test_printpreview_bug396024.xul \
+	     printpreview_bug396024_helper.xul \
+	test_printpreview_bug482976.xul \
+	     printpreview_bug482976_helper.xul \
     $(NULL)
 
 libs:: $(_CHROME_FILES)

layout/base/tests/chrome/test_printpreview_bug396024.xul

@@ -19,6 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=396024
 <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>

layout/base/tests/chrome/test_printpreview_bug482976.xul

@@ -19,6 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=482976
 <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>