wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1103825 - Move toolkit/mozapps/update/tests rules to misc tier; r=mshal

Browse Source 
--HG--
extra : rebase_source : f2d3f5a9a86b25b449a8c5540fa6b39f3edd749f
extra : histedit_source : be7fde50ece8822cd356176717aa4e91873e37bc
This commit is contained in:
Gregory Szorc 2014-11-23 16:16:31 -08:00
parent 4a36efc422
commit 1e9cd1e749
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/mozapps/update/tests/Makefile.in
View File

@ -9,22 +9,23 @@ PP_TARGETS += aus-update-head
aus-update-head_FLAGS := -Fsubstitution $(DEFINES) $(ACDEFINES)
aus-update-head := $(srcdir)/unit_aus_update/head_update.js
aus-update-head_PATH := $(XPCSHELLTESTROOT)/unit_aus_update
aus-update-head_TARGET := misc
INSTALL_TARGETS += xpcshell-data
xpcshell-data_TARGET := libs
xpcshell-data_TARGET := misc
xpcshell-data_DEST := $(XPCSHELLTESTROOT)/data
xpcshell-data_FILES := $(wildcard $(srcdir)/data/*)
# Android doesn't use the Mozilla updater or the toolkit update UI
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
INSTALL_TARGETS += base-updater-head
base-updater-head_TARGET := libs
base-updater-head_TARGET := misc
base-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_base_updater
base-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
ifdef MOZ_MAINTENANCE_SERVICE
INSTALL_TARGETS += service-updater-head
service-updater-head_TARGET := libs
service-updater-head_TARGET := misc
service-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_service_updater
service-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
endif # MOZ_MAINTENANCE_SERVICE
@ -32,7 +33,7 @@ endif # MOZ_MAINTENANCE_SERVICE
ifndef MOZ_PROFILE_GENERATE
ifdef COMPILE_ENVIRONMENT
INSTALL_TARGETS += xpcshell-test-helper
xpcshell-test-helper_TARGET := libs
xpcshell-test-helper_TARGET := misc
xpcshell-test-helper_DEST := $(XPCSHELLTESTROOT)/data
xpcshell-test-helper_FILES := $(DIST)/bin/TestAUSHelper$(BIN_SUFFIX)
endif
@ -45,12 +46,13 @@ _CHROME_SHARED := \
PP_TARGETS += chrome-shared
chrome-shared := $(addprefix $(srcdir)/chrome/,$(_CHROME_SHARED))
chrome-shared_PATH := $(CHROMETESTROOT)/chrome
chrome-shared_TARGET := misc
_CHROME_DATA := \
simple.mar \
$(NULL)
INSTALL_TARGETS += chrome-data
chrome-data_TARGET := libs
chrome-data_TARGET := misc
chrome-data_DEST := $(CHROMETESTROOT)/data
chrome-data_FILES := $(addprefix $(srcdir)/data/,$(_CHROME_DATA))

2
toolkit/mozapps/update/tests/moz.build
View File

@ -4,6 +4,8 @@
# 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/.
HAS_MISC_RULE = True
XPCSHELL_TESTS_MANIFESTS += ['unit_aus_update/xpcshell.ini']
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':