forked from mirrors/gecko-dev
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
116 lines
3.9 KiB
JavaScript
116 lines
3.9 KiB
JavaScript
/* 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/. */
|
|
|
|
/* exported PerTestCoverageUtils */
|
|
|
|
"use strict";
|
|
|
|
var EXPORTED_SYMBOLS = ["PerTestCoverageUtils"];
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
|
|
// This is the directory where gcov is emitting the gcda files.
|
|
const gcovPrefixPath = env.get("GCOV_PREFIX");
|
|
// This is the directory where codecoverage.py is expecting to see the gcda files.
|
|
const gcovResultsPath = env.get("GCOV_RESULTS_DIR");
|
|
// This is the directory where the JS engine is emitting the lcov files.
|
|
const jsvmPrefixPath = env.get("JS_CODE_COVERAGE_OUTPUT_DIR");
|
|
// This is the directory where codecoverage.py is expecting to see the lcov files.
|
|
const jsvmResultsPath = env.get("JSVM_RESULTS_DIR");
|
|
|
|
const gcovPrefixDir = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
|
|
if (gcovPrefixPath) {
|
|
gcovPrefixDir.initWithPath(gcovPrefixPath);
|
|
}
|
|
|
|
let gcovResultsDir = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
|
|
if (gcovResultsPath) {
|
|
gcovResultsDir.initWithPath(gcovResultsPath);
|
|
}
|
|
|
|
const jsvmPrefixDir = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
|
|
if (jsvmPrefixPath) {
|
|
jsvmPrefixDir.initWithPath(jsvmPrefixPath);
|
|
}
|
|
|
|
let jsvmResultsDir = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
|
|
if (jsvmResultsPath) {
|
|
jsvmResultsDir.initWithPath(jsvmResultsPath);
|
|
}
|
|
|
|
function awaitPromise(promise) {
|
|
let ret;
|
|
let complete = false;
|
|
let error = null;
|
|
promise.catch(e => error = e).then(v => {
|
|
ret = v;
|
|
complete = true;
|
|
});
|
|
Services.tm.spinEventLoopUntil(() => complete);
|
|
if (error) {
|
|
throw new Error(error);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
function removeDirectoryContents(dir) {
|
|
let entries = dir.directoryEntries;
|
|
while (entries.hasMoreElements()) {
|
|
entries.nextFile.remove(true);
|
|
}
|
|
}
|
|
|
|
function moveDirectoryContents(src, dst) {
|
|
let entries = src.directoryEntries;
|
|
while (entries.hasMoreElements()) {
|
|
entries.nextFile.moveTo(dst, null);
|
|
}
|
|
}
|
|
|
|
var PerTestCoverageUtils = class PerTestCoverageUtilsClass {
|
|
// Resets the counters to 0.
|
|
static async beforeTest() {
|
|
if (!PerTestCoverageUtils.enabled) {
|
|
return;
|
|
}
|
|
|
|
// Flush the counters.
|
|
let codeCoverageService = Cc["@mozilla.org/tools/code-coverage;1"].getService(Ci.nsICodeCoverage);
|
|
await codeCoverageService.flushCounters();
|
|
|
|
// Remove coverage files created by the flush, and those that might have been created between the end of a previous test and the beginning of the next one (e.g. some tests can create a new content process for every sub-test).
|
|
removeDirectoryContents(gcovPrefixDir);
|
|
removeDirectoryContents(jsvmPrefixDir);
|
|
|
|
// Move coverage files from the GCOV_RESULTS_DIR and JSVM_RESULTS_DIR directories, so we can accumulate the counters.
|
|
moveDirectoryContents(gcovResultsDir, gcovPrefixDir);
|
|
moveDirectoryContents(jsvmResultsDir, jsvmPrefixDir);
|
|
}
|
|
|
|
static beforeTestSync() {
|
|
awaitPromise(this.beforeTest());
|
|
}
|
|
|
|
// Dumps counters and moves the gcda files in the directory expected by codecoverage.py.
|
|
static async afterTest() {
|
|
if (!PerTestCoverageUtils.enabled) {
|
|
return;
|
|
}
|
|
|
|
// Flush the counters.
|
|
let codeCoverageService = Cc["@mozilla.org/tools/code-coverage;1"].getService(Ci.nsICodeCoverage);
|
|
await codeCoverageService.flushCounters();
|
|
|
|
// Move the coverage files in GCOV_RESULTS_DIR and JSVM_RESULTS_DIR, so that the execution from now to shutdown (or next test) is not counted.
|
|
moveDirectoryContents(gcovPrefixDir, gcovResultsDir);
|
|
moveDirectoryContents(jsvmPrefixDir, jsvmResultsDir);
|
|
}
|
|
|
|
static afterTestSync() {
|
|
awaitPromise(this.afterTest());
|
|
}
|
|
};
|
|
|
|
PerTestCoverageUtils.enabled = !!gcovResultsPath;
|