Skip to content

Commit

Permalink
Bug 1363533 - Move nsIJSInspector from devtools/server/ to devtools/p…
Browse files Browse the repository at this point in the history
…latform/. r=gps,jryans

MozReview-Commit-ID: 3ry7pRiqNWv

--HG--
rename : devtools/server/moz.build => devtools/platform/moz.build
rename : devtools/server/nsIJSInspector.idl => devtools/platform/nsIJSInspector.idl
rename : devtools/server/nsJSInspector.cpp => devtools/platform/nsJSInspector.cpp
rename : devtools/server/nsJSInspector.h => devtools/platform/nsJSInspector.h
rename : devtools/server/tests/unit/test_nsjsinspector.js => devtools/platform/tests/unit/test_nsjsinspector.js
extra : rebase_source : 1df23f9247d9202fc7022ae73f8bf4bcf262410b
  • Loading branch information
ochameau committed May 15, 2017
1 parent 2e8bf49 commit 51fbee8
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 13 deletions.
1 change: 1 addition & 0 deletions build/dumbmake-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ toolkit/library
profile
services
startupcache
devtools/platform
devtools/server
devtools/shared
browser/app
Expand Down
2 changes: 2 additions & 0 deletions devtools/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ if CONFIG['MOZ_DEVTOOLS'] == 'all':
# `addon` is a special build mode to strip everything except binary components
# and shim modules that are going to stay in Firefox once DevTools ship as an
# add-on.
# `platform` contains all native components
DIRS += [
'shim',
'platform',
]

if CONFIG['MOZ_DEVTOOLS'] != 'addon':
Expand Down
19 changes: 19 additions & 0 deletions devtools/platform/moz.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- 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/.

XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']

XPIDL_SOURCES += [
'nsIJSInspector.idl',
]

XPIDL_MODULE = 'jsinspector'

SOURCES += [
'nsJSInspector.cpp',
]

FINAL_LIBRARY = 'xul'
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 19 additions & 0 deletions devtools/platform/tests/unit/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Parent config file for all devtools xpcshell files.
module.exports = {
"extends": [
"plugin:mozilla/xpcshell-test"
],
"rules": {
// Allow non-camelcase so that run_test doesn't produce a warning.
"camelcase": "off",
// Allow using undefined variables so that tests can refer to functions
// and variables defined in head.js files, without having to maintain a
// list of globals in each .eslintrc file.
// Note that bug 1168340 will eventually help auto-registering globals
// from head.js files.
"no-undef": "off",
"block-scoped-var": "off",
// Tests can always import anything.
"mozilla/reject-some-requires": "off",
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@

"use strict";

const Cc = Components.classes;
const Ci = Components.interfaces;

// Test the basic functionality of the nsIJSInspector component.
var gCount = 0;
const MAX = 10;

var inspector = Cc["@mozilla.org/jsinspector;1"].getService(Ci.nsIJSInspector);
var tm = Cc["@mozilla.org/thread-manager;1"].getService(Ci.nsIThreadManager);

Expand Down
6 changes: 6 additions & 0 deletions devtools/platform/tests/unit/xpcshell.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[DEFAULT]
tags = devtools
firefox-appdir = browser
skip-if = toolkit == 'android'

[test_nsjsinspector.js]
12 changes: 0 additions & 12 deletions devtools/server/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@ BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']

XPIDL_SOURCES += [
'nsIJSInspector.idl',
]

XPIDL_MODULE = 'jsinspector'

SOURCES += [
'nsJSInspector.cpp',
]

FINAL_LIBRARY = 'xul'

DevToolsModules(
'child.js',
'content-server.jsm',
Expand Down
1 change: 0 additions & 1 deletion devtools/server/tests/unit/xpcshell.ini
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ support-files =
[test_nesting-03.js]
[test_forwardingprefix.js]
[test_getyoungestframe.js]
[test_nsjsinspector.js]
[test_dbgactor.js]
[test_dbgglobal.js]
[test_dbgclient_debuggerstatement.js]
Expand Down

0 comments on commit 51fbee8

Please sign in to comment.