Bug 795393 - Remove instances of "ifneq (mobile,$(MOZ_BUILD_APP))" since they're now always true; r=ted
authorEd Morley <emorley@mozilla.com>
Sat, 06 Oct 2012 16:46:09 +0100
changeset 109507 8180cd29102ac07f1096368bbd98e3f538ac6d7d
parent 109506 c007fea18be1b5f6ba5c826829ba1c4d9e8e3782
child 109508 c532f851ec5716861bbf0ea3dfd2065a205efa37
push id16061
push useremorley@mozilla.com
push dateSat, 06 Oct 2012 15:46:49 +0000
treeherdermozilla-inbound@8180cd29102a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs795393
milestone18.0a1
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 795393 - Remove instances of "ifneq (mobile,$(MOZ_BUILD_APP))" since they're now always true; r=ted
content/events/test/Makefile.in
content/html/document/test/Makefile.in
docshell/test/Makefile.in
docshell/test/navigation/Makefile.in
dom/tests/Makefile.in
editor/libeditor/html/tests/Makefile.in
image/test/Makefile.in
layout/style/test/Makefile.in
layout/xul/base/test/Makefile.in
layout/xul/test/Makefile.in
toolkit/components/downloads/test/Makefile.in
toolkit/components/passwordmgr/test/Makefile.in
toolkit/components/places/tests/Makefile.in
toolkit/components/startup/Makefile.in
toolkit/content/tests/Makefile.in
toolkit/crashreporter/test/Makefile.in
toolkit/mozapps/extensions/test/Makefile.in
toolkit/mozapps/plugins/tests/Makefile.in
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -93,24 +93,18 @@ MOCHITEST_FILES = \
 		test_dom_wheel_event.html \
 		test_continuous_wheel_events.html \
 		test_moz_mouse_pixel_scroll_event.html \
 		test_wheel_default_action.html \
 		window_wheel_default_action.html \
 		test_bug603008.html \
 		test_bug716822.html \
 		test_bug742376.html \
-		$(NULL)
-
-#bug 585630
-ifneq (mobile,$(MOZ_BUILD_APP))
-MOCHITEST_FILES += \
 		test_dragstart.html \
 		$(NULL)
-endif
 
 MOCHITEST_CHROME_FILES = \
 		test_bug336682_2.xul \
 		test_bug336682.js \
 		test_bug586961.xul \
 		test_bug415498.xul \
 		bug415498-doc1.html \
 		bug415498-doc2.html \
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -71,16 +71,14 @@ MOCHITEST_FILES = 	test_bug1682.html \
 		test_bug571981.html \
 		test_bug677495.html \
 		test_bug677495-1.html \
 		test_bug741266.html \
 		test_non-ascii-cookie.html \
 		test_non-ascii-cookie.html^headers^ \
 		$(NULL)
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 MOCHITEST_BROWSER_FILES = \
 		browser_bug592641.js \
 		bug592641_img.jpg \
 		$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -8,30 +8,27 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 MODULE = test_docshell
 
 DIRS += chrome \
 	navigation \
+	browser \
 	$(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 XPCSHELL_TESTS = unit
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 ifneq ($(OS_ARCH),Darwin)
 XPCSHELL_TESTS += unit_ipc
 endif
 
-ifneq (mobile,$(MOZ_BUILD_APP))
-	DIRS += browser
-endif
-
 MOCHITEST_FILES = \
 		test_bug94514.html \
 		bug94514-postpage.html \
 		test_bug123696.html \
 		bug123696-subframe.html \
 		test_bug344861.html \
 		test_bug369814.html \
 		bug369814.zip \
--- a/docshell/test/navigation/Makefile.in
+++ b/docshell/test/navigation/Makefile.in
@@ -49,21 +49,19 @@ MOCHITEST_FILES = \
 		$(NULL)
 
 ifneq (mobile/android,$(MOZ_BUILD_APP))
 MOCHITEST_FILES += \
 		test_bug270414.html \
 		$(NULL)
 endif
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 MOCHITEST_BROWSER_FILES = \
 		browser_bug343515.js \
 		bug343515_pg1.html \
 		bug343515_pg2.html \
 		bug343515_pg3.html \
 		bug343515_pg3_1.html \
 		bug343515_pg3_2.html \
 		bug343515_pg3_1_1.html \
 		$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/tests/Makefile.in
+++ b/dom/tests/Makefile.in
@@ -9,17 +9,13 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_dom
 
 DIRS		+= mochitest \
+		browser \
 		$(NULL)
 XPCSHELL_TESTS = unit
 
-ifneq (mobile,$(MOZ_BUILD_APP))
-	DIRS += browser
-endif
-
 include $(topsrcdir)/config/rules.mk
-
--- a/editor/libeditor/html/tests/Makefile.in
+++ b/editor/libeditor/html/tests/Makefile.in
@@ -77,23 +77,19 @@ MOCHITEST_FILES = \
 		file_select_all_without_body.html \
 		test_root_element_replacement.html \
 		test_bug738366.html \
 		test_bug757371.html \
 		test_bug767684.html \
 		test_bug780035.html \
 		test_bug787432.html \
 		test_bug796839.html \
+		test_spellcheck_pref.html \
 		$(NULL)
 
-ifneq (mobile,$(MOZ_BUILD_APP))
-MOCHITEST_FILES +=  test_spellcheck_pref.html \
-		$(NULL)
-endif
-
 _DATA_FILES = \
 		data/cfhtml-chromium.txt \
 		data/cfhtml-firefox.txt \
 		data/cfhtml-ie.txt \
 		data/cfhtml-ooo.txt \
 		data/cfhtml-nocontext.txt \
 		$(NULL)
 
--- a/image/test/Makefile.in
+++ b/image/test/Makefile.in
@@ -12,16 +12,12 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # Module name for xpcshell tests.
 MODULE		= test_libpr0n
 
 XPCSHELL_TESTS  = unit
 
 DIRS += mochitest \
+        browser \
         $(NULL)
 
-ifneq (mobile,$(MOZ_BUILD_APP))
-DIRS += browser \
-        $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -208,23 +208,21 @@ endif
 		$(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 \
 		$(topsrcdir)/layout/reftests/svg/as-image/lime100x100.svg \
 		$(topsrcdir)/layout/reftests/svg/as-image/svg-image-visited-1-helper.svg \
 		$(topsrcdir)/layout/reftests/svg/as-image/svg-image-visited-2-helper.svg \
 		$(NULL)
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 MOCHITEST_BROWSER_FILES = \
 		browser_bug453896.js \
 		bug453896_iframe.html \
 		media_queries_iframe.html \
 		$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZILLA_INTERNAL_API -D_IMPL_NS_LAYOUT
 
 # FIXME: We don't seem to do auto-generated dependencies here.
 host_ListCSSProperties.$(OBJ_SUFFIX): $(srcdir)/../nsCSSPropList.h
 TestCSSPropertyLookup.$(OBJ_SUFFIX): $(srcdir)/../nsCSSProps.h $(srcdir)/../nsCSSKeywords.h
--- a/layout/xul/base/test/Makefile.in
+++ b/layout/xul/base/test/Makefile.in
@@ -8,27 +8,22 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES = 	test_bug511075.html \
 		test_splitter.xul \
+		test_resizer_incontent.xul \
 		$(NULL)
 
 MOCHITEST_CHROME_FILES =	test_bug381167.xhtml \
 		test_bug393970.xul \
 		test_bug477754.xul \
 		test_stack.xul \
-		$(NULL)
-
-ifneq (mobile,$(MOZ_BUILD_APP))
-MOCHITEST_FILES = 	test_resizer_incontent.xul \
-
-MOCHITEST_CHROME_FILES +=	test_resizer.xul \
+		test_resizer.xul \
 		window_resizer.xul \
 		window_resizer_element.xul \
 		test_windowminmaxsize.xul \
 		$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/xul/test/Makefile.in
+++ b/layout/xul/test/Makefile.in
@@ -20,17 +20,14 @@ MOCHITEST_FILES =\
 MOCHITEST_CHROME_FILES = \
 		test_bug159346.xul \
 		test_bug372685.xul \
 		test_bug398982-1.xul \
 		test_bug398982-2.xul \
 		test_bug703150.xul \
 		$(NULL)
 
-
-ifneq (mobile,$(MOZ_BUILD_APP))
 MOCHITEST_BROWSER_FILES = \
 		browser_bug703210.js \
 		browser_bug706743.js \
 		$(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/downloads/test/Makefile.in
+++ b/toolkit/components/downloads/test/Makefile.in
@@ -13,16 +13,14 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_dm
 
 XPCSHELL_TESTS = \
   unit \
   schema_migration \
   $(NULL)
 
-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
@@ -6,21 +6,19 @@
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(topsrcdir)/config/config.mk
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 DIRS = \
     browser \
     $(NULL)
-endif
 
 # Module name for xpcshell tests.
 MODULE = test_passwordmgr
 XPCSHELL_TESTS = unit
 
 # Mochitest tests
 MOCHITEST_FILES = \
     test_basic_form.html \
--- a/toolkit/components/places/tests/Makefile.in
+++ b/toolkit/components/places/tests/Makefile.in
@@ -35,22 +35,19 @@ MOCHITEST_FILES = \
 	mochitest/test_bug_411966.html \
 	mochitest/test_bug_461710.html \
 	$(NULL)
 
 DIRS = \
 	chrome \
 	mochitest/bug_411966 \
 	mochitest/bug_461710 \
+	browser \
 	$(NULL)
 
-ifneq (mobile,$(MOZ_BUILD_APP))
-	DIRS += browser
-endif
-
 TOOL_DIRS = \
   cpp \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 libs:: $(XPCSHELL_TESTS_COMMON)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/xpcshell/$(relativesrcdir)
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -36,13 +36,11 @@ CMMSRCS += nsUserInfoMac.mm
 else
 CPPSRCS += nsUserInfoUnix.cpp
 endif
 endif
 endif
 
 XPCSHELL_TESTS = tests/unit
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 TEST_DIRS += tests/browser
-endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/content/tests/Makefile.in
+++ b/toolkit/content/tests/Makefile.in
@@ -10,15 +10,11 @@ VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= test_toolkit_general
 
 XPCSHELL_TESTS = unit
 
-DIRS = chrome widgets
-
-ifneq (mobile,$(MOZ_BUILD_APP))
-DIRS += browser
-endif
+DIRS = chrome widgets browser
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -38,31 +38,27 @@ LOCAL_INCLUDES += \
   -I$(XPIDL_GEN_DIR) \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
 EXTRA_DSO_LIBS += xpcom
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
 
 EXTRA_JS_MODULES = CrashTestUtils.jsm
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 MOCHITEST_BROWSER_FILES = \
   browser/head.js \
   browser/crashreport.sjs \
   browser/browser_aboutCrashes.js \
   browser/browser_bug471404.js \
   browser/browser_aboutCrashesResubmit.js \
   $(NULL)
-endif
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DSHARED_LIBRARY=$(SHARED_LIBRARY) -DNOMINMAX
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 libs::  $(MOCHITEST_BROWSER_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/browser
-endif
 
 libs:: $(SHARED_LIBRARY) $(EXTRA_JS_MODULES)
 	$(INSTALL) $^ $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
 	$(INSTALL) $^ $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit_ipc/
 
--- a/toolkit/mozapps/extensions/test/Makefile.in
+++ b/toolkit/mozapps/extensions/test/Makefile.in
@@ -11,23 +11,21 @@ relativesrcdir = @relativesrcdir@
 
 TESTROOT = $(CURDIR)/$(DEPTH)/_tests/xpcshell/$(relativesrcdir)
 TESTXPI = $(TESTROOT)/xpcshell/addons
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_extensionmanager
 
-ifneq (mobile,$(MOZ_BUILD_APP))
- DIRS +=  \
+DIRS += \
     xpinstall \
     browser \
     mochitest \
     $(NULL)
-endif
 
 XPCSHELL_TESTS = \
   xpcshell \
   xpcshell-unpack \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/mozapps/plugins/tests/Makefile.in
+++ b/toolkit/mozapps/plugins/tests/Makefile.in
@@ -9,25 +9,23 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_plugins
 relativesrcdir  = @relativesrcdir@
 TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
 USE_STATIC_LIBS = 1
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_FILES = \
   $(warning browser_bug435788.js has been disabled due to leaks - see bug 751100) \
   pfs_bug435788_1.rdf \
   pfs_bug435788_2.rdf \
   GoodExtension.xpi \
   BadExtension.xpi \
   $(NULL)
-endif
 
 CPPSRCS = \
   GoodPlugin.cpp \
   BadPlugin.cpp \
   $(NULL)
 
 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
@@ -37,14 +35,12 @@ include $(topsrcdir)/config/rules.mk
 
 $(PROGRAMS) $(_BROWSER_FILES): $(TESTROOT)
 $(TESTROOT):
 	$(NSINSTALL) -D $@
 
 $(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
 	cp $< $@
 
-ifneq (mobile,$(MOZ_BUILD_APP))
 libs::
 	$(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT)
 
 libs:: $(PROGRAMS)
-endif