Bug 568733 - patch for mobile specific browser-chrome tests breaks seamonkey. r=ted
authorJustin Wood <Callek@gmail.com>
Wed, 09 Jun 2010 19:29:44 -0400
changeset 43536 1d840cf822e6f12f926c6e714beb8d45a4a19c95
parent 43535 84c15bad7d1cb2248410b1585ef99007a71ba6bb
child 43537 28a9850ae772dce475fd81c6c9436ad569a2b2f7
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs568733
milestone1.9.3a6pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 568733 - patch for mobile specific browser-chrome tests breaks seamonkey. r=ted pending-feedback=jmaher Also RE-enables browser-mochitests for docshell.
docshell/test/Makefile.in
dom/tests/Makefile.in
layout/style/test/Makefile.in
toolkit/components/downloads/test/Makefile.in
toolkit/components/passwordmgr/test/Makefile.in
toolkit/components/places/tests/Makefile.in
toolkit/components/startup/tests/Makefile.in
toolkit/content/tests/Makefile.in
toolkit/crashreporter/test/Makefile.in
toolkit/mozapps/extensions/test/Makefile.in
toolkit/mozapps/plugins/tests/Makefile.in
xpinstall/tests/Makefile.in
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -42,23 +42,24 @@ VPATH		= @srcdir@
 relativesrcdir  = docshell/test
 
 MODULE = test_docshell
 
 DIRS += chrome \
 	navigation \
 	$(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+XPCSHELL_TESTS = unit
+
+include $(DEPTH)/config/autoconf.mk
+
+ifneq (mobile,$(MOZ_BUILD_APP))
 	DIRS += browser
 endif
 
-XPCSHELL_TESTS = unit
-
-include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES = \
 		test_bug94514.html \
 		bug94514-postpage.html \
 		test_bug123696.html \
 		bug123696-subframe.html \
 		test_bug344861.html \
--- a/dom/tests/Makefile.in
+++ b/dom/tests/Makefile.in
@@ -43,14 +43,14 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_dom
 
 DIRS		+= mochitest \
 		$(NULL)
 XPCSHELL_TESTS = unit
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 	dirs += browser
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -214,26 +214,26 @@ GARBAGE += css_properties.js
 		$(NULL)
 
 _VISITED_REFTEST_FILES = \
 		$(shell find $(topsrcdir)/layout/reftests/css-visited/ -name '*.html' -o -name '*.xhtml') \
 		$(topsrcdir)/layout/reftests/svg/pseudo-classes-02.svg \
 		$(topsrcdir)/layout/reftests/svg/pseudo-classes-02-ref.svg \
 		$(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
 		browser_bug453896.js \
 		bug453896_iframe.html \
 		media_queries_iframe.html \
 		$(NULL)
 endif
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
 libs:: $(_VISITED_REFTEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/css-visited/
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 libs:: $(_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 endif
--- a/toolkit/components/downloads/test/Makefile.in
+++ b/toolkit/components/downloads/test/Makefile.in
@@ -45,16 +45,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_dm
 
 XPCSHELL_TESTS = \
   unit \
   schema_migration \
   $(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
   browser \
   $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/components/passwordmgr/test/Makefile.in
+++ b/toolkit/components/passwordmgr/test/Makefile.in
@@ -38,17 +38,17 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = toolkit/components/passwordmgr/test
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
 	browser \
 	$(NULL)
 endif
 
 # Module name for xpcshell tests.
 MODULE		= test_passwordmgr
 
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -68,17 +68,17 @@ MOCHI_TESTS = \
 	$(NULL)
 
 DIRS = \
 	chrome \
 	mochitest/bug_411966 \
 	mochitest/bug_461710 \
 	$(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 	DIRS += browser
 endif
 
 TOOL_DIRS = \
   cpp \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/startup/tests/Makefile.in
+++ b/toolkit/components/startup/tests/Makefile.in
@@ -37,15 +37,15 @@
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
 	browser \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/content/tests/Makefile.in
+++ b/toolkit/content/tests/Makefile.in
@@ -44,13 +44,13 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= test_toolkit_general
 
 XPCSHELL_TESTS = unit
 
 DIRS = chrome widgets
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS += browser
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -72,17 +72,17 @@ EXTRA_DSO_LIBS += xul
 endif
 
 EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) $(XPCOM_LIBS)
 
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   browser/aboutcrashes_utils.js \
   browser/crashreport.sjs \
   browser/browser_aboutCrashes.js \
   browser/browser_bug471404.js \
   browser/browser_aboutCrashesResubmit.js \
   $(NULL)
 
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -47,17 +47,17 @@ relativesrcdir  = toolkit/mozapps/extens
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_extensionmanager
 
 DIRS = \
   xpinstall \
   $(NULL)
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
  DIRS += browser
 endif
 
 
 XPCSHELL_TESTS = \
   xpcshell \
   $(NULL)
 
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -42,17 +42,17 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_plugins
 relativesrcdir  = toolkit/mozapps/plugins/tests
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   browser_bug435788.js \
   pfs_bug435788_1.rdf \
   pfs_bug435788_2.rdf \
   GoodExtension.xpi \
   BadExtension.xpi \
   $(NULL)
 endif
@@ -70,14 +70,14 @@ include $(topsrcdir)/config/rules.mk
 
 $(PROGRAMS) $(_BROWSER_FILES): $(TESTROOT)
 $(TESTROOT):
 	$(NSINSTALL) -D $@
 
 $(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
 	cp $< $@
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 libs::
 	$(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT)
 
 libs:: $(PROGRAMS)
 endif
--- a/xpinstall/tests/Makefile.in
+++ b/xpinstall/tests/Makefile.in
@@ -38,17 +38,17 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = xpinstall/tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-ifeq (browser,$(MOZ_BUILD_APP))
+ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = harness.js \
                  browser_unsigned_url.js \
                  browser_unsigned_trigger.js \
                  browser_whitelist.js \
                  browser_whitelist2.js \
                  browser_whitelist3.js \
                  browser_whitelist4.js \
                  browser_whitelist5.js \