Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-30 05:35:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1280362 - Define gczeal/quit in shell.js, out of browser.js, plus a few other minor changes. r=arai

Browse Source 
--HG--
extra : rebase_source : afec2dbf502c7a3ac4efa0a9ec22316050eb16ef
This commit is contained in:
Jeff Walden 2016-06-29 10:30:57 +01:00
parent d457f414b2
commit 98a4d37640
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/tests/browser.js
View File

@ -194,10 +194,6 @@ function gc()
}
}
function quit()
{
}
function options(aOptionName)
{
// return value of options() is a comma delimited list
@ -276,11 +272,6 @@ function optionsInit() {
}
}
function gczeal(z)
{
SpecialPowers.setGCZeal(z);
}
function jsTestDriverBrowserInit()
{

35
js/src/tests/shell.js
View File

@ -26,6 +26,15 @@
var ReflectApply = global.Reflect.apply;
var StringPrototypeEndsWith = global.String.prototype.endsWith;
var runningInBrowser = typeof global.window !== "undefined";
if (runningInBrowser) {
// Certain cached functionality only exists (and is only needed) when
// running in the browser. Segregate that caching here.
var SpecialPowersSetGCZeal =
global.SpecialPowers ? global.SpecialPowers.setGCZeal : undefined;
}
/****************************
* GENERAL HELPER FUNCTIONS *
****************************/
@ -148,6 +157,28 @@
"print function is pre-existing, either provided by the shell or " +
"the already-executed top-level browser.js");
var quit = global.quit;
if (typeof quit !== "function") {
// XXX There's something very strange about quit() in browser runs being a
// function that doesn't quit at all (!). We should get rid of quit()
// as an integral part of tests in favor of something else.
quit = function quit() {};
global.quit = quit;
}
var gczeal = global.gczeal;
if (typeof gczeal !== "function") {
if (typeof SpecialPowersSetGCZeal === "function") {
gczeal = function gczeal(z) {
SpecialPowersSetGCZeal(z);
};
} else {
gczeal = function() {}; // no-op if not available
}
global.gczeal = gczeal;
}
/******************************************************
* TEST METADATA EXPORTS (these are of dubious value) *
******************************************************/
@ -242,8 +273,6 @@
var STATUS = "STATUS: ";
var SECT_PREFIX = 'Section ';
var SECT_SUFFIX = ' of test - ';
var gDelayTestDriverEnd = false;
@ -349,7 +378,7 @@ function expectExitCode(n)
*/
function inSection(x)
{
return SECT_PREFIX + x + SECT_SUFFIX;
return "Section " + x + " of test - ";
}
/*