Backed out changeset 192d517219c1 (bug 1369801)

MozReview-Commit-ID: KeLy0a8hjVF
This commit is contained in:
Sebastian Hengst 2017-07-27 18:14:38 +02:00
parent 31b6c003f8
commit 205843f800
27 changed files with 24 additions and 59 deletions

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../shared/tests/shared-xpcshell-head.js xpcshell-head.js
head = xpcshell-head.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../shared/tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
firefox-appdir = browser
head = ../../../../../shared/tests/shared-xpcshell-head.js head.js
head = head.js
[test_compare_fragments_geometry.js]

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools devtools-memory
head = ../../../../shared/tests/shared-xpcshell-head.js head.js ../../../framework/test/shared-redux-head.js
head = head.js ../../../framework/test/shared-redux-head.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../shared/tests/shared-xpcshell-head.js head.js
head = head.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../shared/tests/shared-xpcshell-head.js head.js ../../../framework/test/shared-redux-head.js
head = head.js ../../../framework/test/shared-redux-head.js
firefox-appdir = browser
[test_add_device.js]

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../../shared/tests/shared-xpcshell-head.js head.js
head = head.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../shared/tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../../../shared/tests/shared-xpcshell-head.js head_stringvalidator.js
head = head_stringvalidator.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../../shared/tests/shared-xpcshell-head.js head_tern.js
head = head_tern.js
firefox-appdir = browser
[test_autocompletion.js]

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../../../shared/tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,5 @@
[DEFAULT]
tags = devtools
head = ../../../shared/tests/shared-xpcshell-head.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../shared/tests/shared-xpcshell-head.js head_dbg.js
head = head_dbg.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js head_acorn.js
head = head_acorn.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
[test_discovery.js]

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools heapsnapshot devtools-memory
head = ../../../tests/shared-xpcshell-head.js head_heapsnapshot.js
head = head_heapsnapshot.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js head_jsbeautify.js
head = head_jsbeautify.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -6,10 +6,6 @@
include('../templates.mozbuild')
TEST_HARNESS_FILES.xpcshell.devtools.shared.tests += [
'tests/shared-xpcshell-head.js',
]
DIRS += [
'acorn',
'apps',

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../shared/tests/shared-xpcshell-head.js head.js
head = head.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
[test_stack.js]

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js head_pretty-fast.js
head = head_pretty-fast.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
[test_encode.js]

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js head_dbg.js
head = head_dbg.js
firefox-appdir = browser
support-files=

View File

@ -1,30 +0,0 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
(() => {
const {interfaces: Ci, utils: Cu} = Components;
const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
// Load our bootstrap extension manifest so we can access our chrome/resource URIs.
const EXTENSION_ID = "devtools@mozilla.org";
let extensionDir = Services.dirsvc.get("GreD", Ci.nsIFile);
extensionDir.append("browser");
extensionDir.append("features");
extensionDir.append(EXTENSION_ID);
// If the unpacked extension doesn't exist, use the packed version.
// Typically running tests on a local build will rely on the unpacked version
// while running tests against a packaged Firefox build (on try for instance) will
// rely on the xpi.
if (!extensionDir.exists()) {
extensionDir = extensionDir.parent;
extensionDir.append(EXTENSION_ID + ".xpi");
}
Components.manager.addBootstrappedManifestLocation(extensionDir);
// Load devtools preferences that should normally be loaded by bootstrap.js
let {DevToolsPreferences} =
Cu.import("chrome://devtools/content/preferences/DevToolsPreferences.jsm", {});
DevToolsPreferences.loadPrefs();
})();

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../shared-xpcshell-head.js head_devtools.js
head = head_devtools.js
firefox-appdir = browser
skip-if = toolkit == 'android'
support-files =

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js head_dbg.js
head = head_dbg.js
firefox-appdir = browser
skip-if = toolkit == 'android'

View File

@ -1,6 +1,6 @@
[DEFAULT]
tags = devtools
head = ../../../tests/shared-xpcshell-head.js
head =
firefox-appdir = browser
skip-if = toolkit == 'android'
support-files =