Bug 882848 - Use MOCHITEST_BROWSER_FILES more; r=gps

This commit is contained in:
Ms2ger 2013-06-23 09:16:19 +02:00
parent 3ac11adced
commit 2c937acc56
20 changed files with 79 additions and 155 deletions

View File

@ -61,7 +61,7 @@ endif
# browser_bug321000.js is disabled because newline handling is shaky (bug 592528)
# browser_bug386835.js is disabled for intermittent failures (bug 880226)
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES = \
head.js \
browser_typeAheadFind.js \
browser_keywordSearch.js \
@ -340,36 +340,33 @@ _BROWSER_FILES = \
# Disable tests on Windows due to frequent failures (bugs 825739, 841341)
ifneq (windows,$(MOZ_WIDGET_TOOLKIT))
_BROWSER_FILES += \
MOCHITEST_BROWSER_FILES += \
browser_bookmark_titles.js \
browser_popupNotification.js \
$(NULL)
endif
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
_BROWSER_FILES += \
MOCHITEST_BROWSER_FILES += \
browser_bug462289.js \
$(NULL)
else
_BROWSER_FILES += \
MOCHITEST_BROWSER_FILES += \
browser_bug565667.js \
$(NULL)
endif
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
# Bug 766546.
_BROWSER_FILES += \
MOCHITEST_BROWSER_FILES += \
browser_bug561636.js \
$(NULL)
endif
ifdef MOZ_DATA_REPORTING
_BROWSER_FILES += \
MOCHITEST_BROWSER_FILES += \
browser_datareporting_notification.js \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES = \
browser_newtab_block.js \
browser_newtab_disable.js \
browser_newtab_drag_drop.js \
@ -35,5 +34,4 @@ _BROWSER_FILES = \
head.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES = \
head.js \
blocklist.xml \
blocklistEmpty.xml \
@ -45,6 +45,3 @@ _BROWSER_FILES = \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

View File

@ -10,7 +10,7 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
opengraph.html \
og_invalid_url.html \
shortlink_linkrel.html \
@ -19,6 +19,3 @@ _BROWSER_FILES = \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

View File

@ -10,12 +10,10 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES := \
browser_bug431826.js \
browser_bug633691.js \
$(NULL)
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = browser_bug431826.js \
browser_bug633691.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
head.js \
browser_advanced_update.js \
browser_bug410900.js \
@ -26,8 +25,9 @@ _BROWSER_FILES = \
$(NULL)
ifdef MOZ_SERVICES_HEALTHREPORT
_BROWSER_FILES += browser_healthreport.js
MOCHITEST_BROWSER_FILES += \
browser_healthreport.js \
$(NULL)
endif
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
head.js \
browser_advanced_update.js \
browser_bug410900.js \
@ -27,8 +26,7 @@ _BROWSER_FILES = \
$(NULL)
ifdef MOZ_SERVICES_HEALTHREPORT
_BROWSER_FILES += browser_healthreport.js
MOCHITEST_BROWSER_FILES += browser_healthreport.js
endif
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -10,19 +10,18 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
MOCHITEST_BROWSER_FILES := \
head.js \
browser_bug400731.js \
$(NULL)
# The browser chrome test for bug 415846 doesn't run on Mac because of its
# bizarre special-and-unique snowflake of a help menu.
ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
_NON_MAC_BROWSER_TESTS = browser_bug415846.js
MOCHITEST_BROWSER_FILES += \
browser_bug415846.js \
$(NULL)
endif
_BROWSER_FILES = head.js \
browser_bug400731.js \
$(_NON_MAC_BROWSER_TESTS) \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_tabview_alltabs.js \
browser_tabview_apptabs.js \
browser_tabview_bug580412.js \
@ -169,5 +168,4 @@ _BROWSER_FILES = \
# browser_tabview_bug673729.js disabled for intermittent failures (bug 749980)
# browser_tabview_bug696602.js disabled for intermittent failures (bug 736425)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,14 +9,11 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_fontinspector.js \
browser_fontinspector.html \
browser_font.woff \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_inspector_iframeTest.js \
browser_inspector_initialization.js \
browser_inspector_highlighter.js \
@ -47,5 +46,4 @@ _BROWSER_FILES = \
head.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,12 +9,9 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_layoutview.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_inspector_markup_navigation.html \
browser_inspector_markup_navigation.js \
browser_inspector_markup_mutation.html \
@ -23,5 +22,4 @@ _BROWSER_FILES = \
head.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -1,39 +1,6 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Mozilla Foundation.
# Portions created by the Initial Developer are Copyright (C) 2012
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Paul Rouget <paul@mozilla.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either of the GNU General Public License Version 2 or later (the "GPL"),
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
@ -42,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_responsiveui.js \
browser_responsiveuiaddcustompreset.js \
browser_responsiveruleview.js \
@ -53,5 +19,4 @@ _BROWSER_FILES = \
head.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_TEST_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_styleeditor_enabled.js \
browser_styleeditor_filesave.js \
browser_styleeditor_cmd_edit.js \
@ -52,5 +51,4 @@ _BROWSER_TEST_FILES = \
test_private.css \
$(NULL)
libs:: $(_BROWSER_TEST_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,18 +9,17 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
MOCHITEST_BROWSER_FILES := \
browser_Application.js \
browser_ApplicationPrefs.js \
browser_ApplicationStorage.js \
browser_ApplicationQuitting.js \
browser_Bookmarks.js \
browser_Browser.js \
ContentA.html \
ContentB.html \
ContentWithFrames.html \
$(NULL)
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES =browser_Application.js \
browser_ApplicationPrefs.js \
browser_ApplicationStorage.js \
browser_ApplicationQuitting.js \
browser_Bookmarks.js \
browser_Browser.js \
ContentA.html \
ContentB.html \
ContentWithFrames.html \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

View File

@ -10,19 +10,17 @@ relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
browser_NetworkPrioritizer.js \
# bug 793906 - temporarily disabling desktop UI while working on b2g
# browser_SignInToWebsite.js \
$(NULL)
MOCHITEST_BROWSER_FILES := \
browser_NetworkPrioritizer.js \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
_BROWSER_FILES += \
browser_taskbar_preview.js \
$(NULL)
MOCHITEST_BROWSER_FILES += \
browser_taskbar_preview.js \
$(NULL)
endif
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
# bug 793906 - temporarily disabling desktop UI while working on b2g
# browser_SignInToWebsite.js
include $(topsrcdir)/config/rules.mk

View File

@ -1,4 +1,3 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@ -10,11 +9,9 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_dead_object.js \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -9,9 +9,8 @@ VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES := \
browser_thumbnails_background.js \
browser_thumbnails_capture.js \
browser_thumbnails_expiration.js \
@ -29,5 +28,4 @@ _BROWSER_FILES = \
thumbnails_background.sjs \
$(NULL)
libs:: $(_BROWSER_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk

View File

@ -13,7 +13,7 @@ relativesrcdir = @relativesrcdir@
TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
USE_STATIC_LIBS = 1
_BROWSER_FILES = \
MOCHITEST_BROWSER_FILES = \
$(filter disabled-for-leaks--bug-751100, browser_bug435788.js) \
pfs_bug435788_1.rdf \
pfs_bug435788_2.rdf \
@ -27,14 +27,11 @@ PROGRAMS = $(SIMPLE_PROGRAMS:%$(BIN_SUFFIX)=$(TESTROOT)/%)
include $(topsrcdir)/config/rules.mk
$(PROGRAMS) $(_BROWSER_FILES): $(TESTROOT)
$(PROGRAMS): $(TESTROOT)
$(TESTROOT):
$(NSINSTALL) -D $@
$(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
cp $< $@
libs::
$(INSTALL) $(foreach f,$(_BROWSER_FILES),"$(srcdir)/$f") $(TESTROOT)
libs:: $(PROGRAMS)