wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1164039 - moved TelemetryTimestamps.jsm and tests to toolkit/componets/telemetry/. r=dexter

Browse Source
This commit is contained in:
rthyberg 2015-11-08 16:25:00 +01:00
parent af2cfaa086
commit 0e0f6f8e71
6 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
toolkit/modules/TelemetryTimestamps.jsm → toolkit/components/telemetry/TelemetryTimestamps.jsm
View File

1
toolkit/components/telemetry/moz.build
View File

@ -40,6 +40,7 @@ EXTRA_JS_MODULES += [
'TelemetrySession.jsm',
'TelemetryStopwatch.jsm',
'TelemetryStorage.jsm',
'TelemetryTimestamps.jsm',
'TelemetryUtils.jsm',
'ThirdPartyCookieProbe.jsm',
'UITelemetry.jsm',

2
toolkit/modules/tests/xpcshell/test_TelemetryTimestamps.js → toolkit/components/telemetry/tests/unit/test_TelemetryTimestamps.js
View File

@ -24,7 +24,7 @@ var gGlobalScope = this;
function loadAddonManager() {
let ns = {};
Cu.import("resource://gre/modules/Services.jsm", ns);
let head = "../../../mozapps/extensions/test/xpcshell/head_addons.js";
let head = "../../../../mozapps/extensions/test/xpcshell/head_addons.js";
let file = do_get_file(head);
let uri = ns.Services.io.newFileURI(file);
ns.Services.scriptloader.loadSubScript(uri.spec, gGlobalScope);

2
toolkit/components/telemetry/tests/unit/xpcshell.ini
View File

@ -63,3 +63,5 @@ skip-if = os == "android"
tags = addons
[test_TelemetryReportingPolicy.js]
tags = addons
[test_TelemetryTimestamps.js]
skip-if = toolkit == 'android'

1
toolkit/modules/moz.build
View File

@ -73,7 +73,6 @@ EXTRA_JS_MODULES += [
'SpatialNavigation.jsm',
'Sqlite.jsm',
'Task.jsm',
'TelemetryTimestamps.jsm',
'Timer.jsm',
'Troubleshoot.jsm',
'UpdateUtils.jsm',

2
toolkit/modules/tests/xpcshell/xpcshell.ini
View File

@ -53,8 +53,6 @@ skip-if = toolkit == 'android'
skip-if = toolkit == 'android'
[test_task.js]
skip-if = toolkit == 'android'
[test_TelemetryTimestamps.js]
skip-if = toolkit == 'android'
[test_timer.js]
skip-if = toolkit == 'android'
[test_UpdateUtils_url.js]