Bug 1435429 - Android 'mach mochitest' fails: 'A cross-directory support file path noted in a test manifest does not appear in any other manifest.' r=bc,chmanchester
authorMichael Ratcliffe <mratcliffe@mozilla.com>
Tue, 28 Aug 2018 20:29:58 +0000
changeset 488711 ae13aec18c6c2252c01f44565909014a36a5a544
parent 488710 836086dfcd2fb2017381a4ec5d32f757f8b1458f
child 488712 8a25fc40764a60d9dd5a72b710955bf45220f94d
push id9734
push usershindli@mozilla.com
push dateThu, 30 Aug 2018 12:18:07 +0000
treeherdermozilla-beta@71c71ab3afae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbc, chmanchester
bugs1435429
milestone63.0a1
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
Bug 1435429 - Android 'mach mochitest' fails: 'A cross-directory support file path noted in a test manifest does not appear in any other manifest.' r=bc,chmanchester Differential Revision: https://phabricator.services.mozilla.com/D4214
devtools/server/moz.build
devtools/shared/moz.build
devtools/shared/worker/moz.build
devtools/startup/moz.build
--- a/devtools/server/moz.build
+++ b/devtools/server/moz.build
@@ -8,17 +8,19 @@ include('../templates.mozbuild')
 
 DIRS += [
     'actors',
     'performance',
     'socket',
     'startup',
 ]
 
-BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+    BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 DevToolsModules(
     'main.js',
 )
 
 with Files('**'):
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -34,17 +34,19 @@ DIRS += [
     'webconsole',
     'worker',
 ]
 
 # Only ship test helpers in local builds
 if not CONFIG['MOZILLA_OFFICIAL']:
     DIRS += ['test-helpers']
 
-BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+    BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 JAR_MANIFESTS += ['jar.mn']
 
 DevToolsModules(
     'async-storage.js',
     'async-utils.js',
--- a/devtools/shared/worker/moz.build
+++ b/devtools/shared/worker/moz.build
@@ -1,13 +1,14 @@
 # -*- 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/.
 
-BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+    BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 
 DevToolsModules(
     'helper.js',
     'loader.js',
     'worker.js',
 )
--- a/devtools/startup/moz.build
+++ b/devtools/startup/moz.build
@@ -22,9 +22,11 @@ if CONFIG['MOZ_DEVTOOLS'] == 'all':
     ]
 
     DIRS += [
       'aboutdevtools',
       'locales',
     ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
-BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
+
+if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
+    BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']