bug 431453 - Make browser-chrome mochitests pass on SeaMonkey: make some platform tests Firefox-only or non-SeaMonkey (as applicable), r=smontagu for docshell, r=dwitte for cookie, r=gavin for dlmgr, a1.9=damons for platform tests; make SeaMonkey sanitizer tests pass, sr=Neil
authorkairo@kairo.at
Fri, 02 May 2008 06:13:19 -0700
changeset 14888 f0632f4c86c87aa3effab9b122540a8a7e5a09ff
parent 14887 166f5bbd468aba90a046ee72384c8acab24c7856
child 14889 5b2045ef2a70596991fb0623dfc96df4b66a25ea
push idunknown
push userunknown
push dateunknown
reviewerssmontagu, dwitte, gavin, Neil
bugs431453
milestone1.9pre
bug 431453 - Make browser-chrome mochitests pass on SeaMonkey: make some platform tests Firefox-only or non-SeaMonkey (as applicable), r=smontagu for docshell, r=dwitte for cookie, r=gavin for dlmgr, a1.9=damons for platform tests; make SeaMonkey sanitizer tests pass, sr=Neil
docshell/test/browser/Makefile.in
extensions/cookie/test/Makefile.in
toolkit/mozapps/downloads/Makefile.in
--- a/docshell/test/browser/Makefile.in
+++ b/docshell/test/browser/Makefile.in
@@ -39,18 +39,24 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir	= docshell/test/browser 
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES =	\
-		browser_bug92473.js \
-		test-form_sjis.html \
-		browser_bug134911.js \
 		browser_bug349769.js \
 		browser_bug388121-1.js \
 		browser_bug388121-2.js \
 		$(NULL)
 
+# the tests below use FUEL, which is a Firefox-specific feature
+ifdef MOZ_PHOENIX
+_BROWSER_TEST_FILES +=	\
+		browser_bug92473.js \
+		test-form_sjis.html \
+		browser_bug134911.js \
+		$(NULL)
+endif
+
 libs:: $(_BROWSER_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
--- a/extensions/cookie/test/Makefile.in
+++ b/extensions/cookie/test/Makefile.in
@@ -71,22 +71,28 @@ MODULE          = test_cookies
   test_same_base_domain_3.html \
   test_same_base_domain_4.html \
   file_localhost_inner.html \
   test_same_base_domain_5.html \
   test_same_base_domain_6.html \
   file_loopback_inner.html \
 	$(NULL)
 
+# the tests below use Firefox-specific features
+ifdef MOZ_PHOENIX
 _BROWSER_TEST_FILES = \
   browser_test_favicon.js \
   $(NULL)
+endif
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
+# see above, only defined for Firefox
+ifdef MOZ_PHOENIX
 libs:: $(_BROWSER_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+endif
 
 XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -39,16 +39,14 @@ DEPTH   = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifndef MOZ_SUITE
 # XXX Suite doesn't want these just yet
-DIRS = src
+DIRS = src tests
 endif
 
-DIRS += tests
-
 include $(topsrcdir)/config/rules.mk