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 1035562 - Re-enable maintenance service tests for x64 Windows. r=rstrong

Browse Source
This commit is contained in:
Brian R. Bondy 2014-10-10 23:13:55 -04:00
parent b937b77ab6
commit 54b6fad663
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,12 +23,10 @@ base-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_base_updater
base-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
ifdef MOZ_MAINTENANCE_SERVICE
ifndef HAVE_64BIT_BUILD
INSTALL_TARGETS += service-updater-head
service-updater-head_TARGET := libs
service-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_service_updater
service-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
endif # HAVE_64BIT_BUILD
endif # MOZ_MAINTENANCE_SERVICE
ifndef MOZ_PROFILE_GENERATE

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

@ -10,7 +10,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['unit_base_updater/xpcshell.ini']
if CONFIG['MOZ_MAINTENANCE_SERVICE'] and not CONFIG['HAVE_64BIT_BUILD']:
if CONFIG['MOZ_MAINTENANCE_SERVICE']:
XPCSHELL_TESTS_MANIFESTS += ['unit_service_updater/xpcshell.ini']
SimplePrograms([
@ -44,7 +44,7 @@ for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME',
DEFINES['NS_NO_XPCOM'] = True
if CONFIG['MOZ_MAINTENANCE_SERVICE'] and not CONFIG['HAVE_64BIT_BUILD']:
if CONFIG['MOZ_MAINTENANCE_SERVICE']:
DEFINES['MOZ_MAINTENANCE_SERVICE'] = CONFIG['MOZ_MAINTENANCE_SERVICE']
# For debugging purposes only