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

@@ -44,13 +44,19 @@ 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)

extensions/cookie/test/Makefile.in

@@ -76,15 +76,21 @@ _TEST_FILES = \
   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
 

toolkit/mozapps/downloads/Makefile.in

@@ -44,11 +44,9 @@ 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