Backed out changeset 1a8114aa64c1 (bug 1287827) for breaking tests

This commit is contained in:
Mark Banner 2016-07-29 18:14:48 +01:00
Родитель b5f9f1309f
Коммит 08ab3adda4
6 изменённых файлов: 21 добавлений и 0 удалений

Просмотреть файл

@ -74,6 +74,9 @@ browser/extensions/pdfjs/**
browser/extensions/pocket/content/panels/js/vendor/**
browser/locales/**
# Ignore all of loop since it is imported from github and checked at source.
browser/extensions/loop/**
# devtools/ exclusions
devtools/client/canvasdebugger/**
devtools/client/commandline/**

3
.gitignore поставляемый
Просмотреть файл

@ -11,6 +11,9 @@ ID
*.pdb
*.egg-info
# Allow the id locale directory for loop ('ID' matches this normally)
!browser/extensions/loop/chrome/locale/id
# Vim swap files.
.*.sw[a-z]

Просмотреть файл

@ -87,6 +87,16 @@ GRTAGS
GSYMS
GPATH
# Various items for Loop
^browser/components/loop/standalone/content/config\.js$
^browser/extensions/loop/.*/node_modules/
^browser/extensions/loop/.*\.module-cache
^browser/extensions/loop/test/coverage/desktop
^browser/extensions/loop/test/coverage/shared_standalone
^browser/extensions/loop/test/visual-regression/diff
^browser/extensions/loop/test/visual-regression/new
^browser/extensions/loop/test/visual-regression/refs
# Git clone directory for updating web-platform-tests
^testing/web-platform/sync/

Просмотреть файл

@ -6,6 +6,7 @@
DIRS += [
'e10srollout',
'loop',
'pdfjs',
'pocket',
'webcompat',

Просмотреть файл

@ -106,6 +106,7 @@ libs-%:
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../extensions/pocket/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../extensions/loop/chrome/locale AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*

Просмотреть файл

@ -5,6 +5,9 @@ test_container = true
; layout tests
[include:../../../../../layout/base/tests/marionette/manifest.ini]
; loop tests
[include:../../../../../browser/extensions/loop/manifest.ini]
; microformats tests
[include:../../../../../toolkit/components/microformats/manifest.ini]