Backed out changeset 1a8114aa64c1 (bug 1287827) for breaking tests
authorMark Banner <standard8@mozilla.com>
Fri, 29 Jul 2016 18:14:48 +0100
changeset 394529 9346c1a86c6c5f09817f60eb600543bcac65ce94
parent 394528 5d0e37d0ee2dcee5eb41c16ef682164cffd47d33
child 394530 1eb17b0136e19cd9bfb207775fed7555e223986b
push id24593
push usermwein@mozilla.com
push dateFri, 29 Jul 2016 22:14:07 +0000
bugs1287827
milestone50.0a1
backs out1a8114aa64c1c63a17a813ff82b625f53d813c0c
Backed out changeset 1a8114aa64c1 (bug 1287827) for breaking tests
.eslintignore
.gitignore
.hgignore
browser/extensions/moz.build
browser/locales/Makefile.in
testing/marionette/harness/marionette/tests/unit-tests.ini
--- a/.eslintignore
+++ b/.eslintignore
@@ -69,16 +69,19 @@ browser/components/privatebrowsing/**
 browser/components/sessionstore/**
 browser/components/shell/**
 browser/components/tabview/**
 browser/components/translation/**
 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/**
 devtools/client/debugger/**
 devtools/client/eyedropper/**
 devtools/client/framework/**
 devtools/client/jsonview/lib/**
 devtools/client/memory/**
--- a/.gitignore
+++ b/.gitignore
@@ -6,16 +6,19 @@
 *.pyo
 TAGS
 tags
 ID
 .DS_Store*
 *.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]
 
 # Emacs directory variable files.
 **/.dir-locals.el
 
 # User files that may appear at the root
 /.mozconfig*
--- a/.hgignore
+++ b/.hgignore
@@ -82,16 +82,26 @@
 ^media/libstagefright/android$
 
 # Tag files generated by GNU Global
 GTAGS
 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/
 
 # Android Gradle artifacts.
 ^mobile/android/gradle/.gradle
 
 # XCode project cruft
 ^embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/xcuserdata
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -1,16 +1,17 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 DIRS += [
     'e10srollout',
+    'loop',
     'pdfjs',
     'pocket',
     'webcompat',
 ]
 
 # Only include the following system add-ons if building Aurora or Nightly
 if 'a' in CONFIG['GRE_MILESTONE']:
     DIRS += [
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -101,16 +101,17 @@ searchplugins:: $(list-txt)
 DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc))
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(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-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
 
 repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
 repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
--- a/testing/marionette/harness/marionette/tests/unit-tests.ini
+++ b/testing/marionette/harness/marionette/tests/unit-tests.ini
@@ -1,12 +1,15 @@
 ; marionette unit tests
 [include:unit/unit-tests.ini]
 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]
 
 ; migration tests
 [include:../../../../../browser/components/migration/tests/marionette/manifest.ini]