Backed out changeset 2f0509d0adb3 (bug 920223)
authorEd Morley <emorley@mozilla.com>
Mon, 30 Sep 2013 12:49:59 +0100
changeset 149254 d884bd18873c0b20efd2cb21eb9635cd30a56e30
parent 149253 e9c35a179f6508c9d5dd63d950380c6bedd0d601
child 149255 1c8514e27576d8b74487523b824c6d10fa160820
push id25380
push userryanvm@gmail.com
push dateMon, 30 Sep 2013 20:16:36 +0000
treeherdermozilla-central@1332fc1c15e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs920223
milestone27.0a1
backs out2f0509d0adb3787faa945660684b8cad69c51609
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 2f0509d0adb3 (bug 920223)
dom/devicestorage/ipc/Makefile.in
toolkit/components/places/tests/browser/browser_colorAnalyzer.js
toolkit/components/satchel/test/browser/Makefile.in
toolkit/content/tests/chrome/Makefile.in
toolkit/mozapps/update/test/chrome/Makefile.in
--- a/dom/devicestorage/ipc/Makefile.in
+++ b/dom/devicestorage/ipc/Makefile.in
@@ -1,8 +1,6 @@
 # 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/.
 
-MOCHITEST_FILES := ../test/devicestorage_common.js
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
+++ b/toolkit/components/places/tests/browser/browser_colorAnalyzer.js
@@ -317,17 +317,17 @@ tests.push(function test_perfBigImage() 
     info("perfBigImage: " + ((new Date()) - t1) + "ms");
     nextStep();
   }, "", true);
 });
 
 
 // the rest of the tests are for coverage of "real" favicons
 // exact color isn't terribly important, just make sure it's reasonable
-const filePrefix = getRootDirectory(gTestPath) + "colorAnalyzer/";
+const filePrefix = getRootDirectory(gTestPath);
 
 tests.push(function test_categoryDiscover() {
   frcTest(filePrefix + "category-discover.png", 0xB28D3A,
           "category-discover analysis returns red");
 });
 
 tests.push(function test_localeGeneric() {
   frcTest(filePrefix + "localeGeneric.png", 0x00A400,
--- a/toolkit/components/satchel/test/browser/Makefile.in
+++ b/toolkit/components/satchel/test/browser/Makefile.in
@@ -1,5 +1,4 @@
 # 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/.
 
-MOCHITEST_BROWSER_FILES := ../subtst_privbrowsing.html
--- a/toolkit/content/tests/chrome/Makefile.in
+++ b/toolkit/content/tests/chrome/Makefile.in
@@ -1,17 +1,12 @@
 # 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/.
 
-MOCHITEST_CHROME_FILES := \
-  ../widgets/popup_shared.js \
-  ../widgets/tree_shared.js \
-  $(SHULL)
-
 # test_panel_focus.xul won't work if the Full Keyboard Access preference is set to
 # textboxes and lists only, so skip this test on Mac
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_CHROME_FILES += test_panel_focus.xul \
                window_panel_focus.xul \
                test_chromemargin.xul \
                window_chromemargin.xul \
                bug451540_window.xul \
--- a/toolkit/mozapps/update/test/chrome/Makefile.in
+++ b/toolkit/mozapps/update/test/chrome/Makefile.in
@@ -1,16 +1,11 @@
 # 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/.
 
-MOCHITEST_CHROME_FILES := \
-  ../unit/data/simple.mar \
-  ../unit/data/simple_no_pib.mar \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 libs:: 
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(srcdir)/utils.js > \
     $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/utils.js
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(srcdir)/update.sjs > \
     $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/update.sjs