Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-05-13 08:57:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 693959 - convert quit.js to specialpowers. r=ted

Browse Source
This commit is contained in:
Joel Maher 2011-10-14 07:52:02 -04:00
parent 9da386ab63
commit a6c0cdaff1
18 changed files with 28 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/mochitest/Makefile.in
View File

@ -91,8 +91,6 @@ _SERV_FILES = \
browser-test-overlay.xul \
browser-test.js \
chrome-harness.js \
ipc-overlay.xul \
ipc.js \
browser-harness.xul \
redirect.html \
$(topsrcdir)/build/pgo/server-locations.txt \

4
testing/mochitest/browser-harness.xul
View File

@ -46,7 +46,6 @@
width="1024">
<script src="chrome://mochikit/content/tests/SimpleTest/MozillaLogger.js"/>
<script src="chrome://mochikit/content/tests/SimpleTest/LogController.js"/>
<script src="chrome://mochikit/content/tests/SimpleTest/quit.js"/>
<script src="chrome://mochikit/content/chrome-harness.js"/>
<style xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
#results {
@ -266,7 +265,8 @@
window.focus();
if (gConfig.closeWhenDone) {
goQuitApplication();
let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
appStartup.quit(Ci.nsIAppStartup.eForceQuit);
return;
}

2
testing/mochitest/harness-overlay.xul
View File

@ -21,8 +21,6 @@
src="chrome://mochikit/content/tests/SimpleTest/TestRunner.js"/>
<script type="text/javascript"
src="chrome://mochikit/content/tests/SimpleTest/MozillaLogger.js"/>
<script type="text/javascript"
src="chrome://mochikit/content/tests/SimpleTest/quit.js" />
<script type="application/javascript"
src="chrome://mochikit/content/chrome-harness.js" />
<script type="text/javascript"

74
testing/mochitest/ipc-overlay.xul
View File

@ -1,74 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla's layout acceptance tests.
-
- The Initial Developer of the Original Code is the Mozilla Foundation.
- Portions created by the Initial Developer are Copyright (C) 2006
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Joel Maher <joel.maher@gmail.com>, Mozilla Corporation (original author)
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/static/harness.css"
type="text/css"?>
<overlay id="browserTestOverlay"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<window>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/quit.js" />
<script type="application/javascript;version=1.7">
function messageHandler(m) {
var data = m.json.data;
switch(m.json.type) {
case 'QuitApplication':
messageManager.removeMessageListener("chromeEvent", messageHandler);
goQuitApplication();
break;
case 'Focus':
window.focus();
break;
default:
break;
}
}
function setup() {
window.removeEventListener("load", setup, false);
messageManager.loadFrameScript("chrome://mochikit/content/ipc.js", true);
messageManager.addMessageListener("chromeEvent", messageHandler);
}
window.addEventListener("load", setup, false);
</script>
</window></overlay>

205
testing/mochitest/ipc.js
View File

@ -1,205 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla's layout acceptance tests.
*
* The Initial Developer of the Original Code is the Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joel Maher <joel.maher@gmail.com>, Mozilla Corporation (original author)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
if (Cc === undefined) {
var Cc = Components.classes;
var Ci = Components.interfaces;
}
function ipcEvent(e) {
var sync = e.getData("sync");
var type = e.getData("type");
var data = JSON.parse(e.getData("data"));
switch(type) {
case 'waitForFocus':
if (content)
var wrapper = content.wrappedJSObject.frames[0].SimpleTest;
else
var wrapper = SimpleTest;
ipctest.waitForFocus(wrapper[data.callback], data.targetWindow, data.expectBlankPage);
break;
default:
if (type == 'QuitApplication') {
removeEventListener("contentEvent", function (e) { ipcEvent(e); }, false, true);
}
if (sync == 1) {
return sendSyncMessage("chromeEvent", {"type":type, "data":data});
} else {
sendAsyncMessage("chromeEvent", {"type":type, "data":data});
}
}
};
var xulRuntime = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULRuntime);
//check if we are in content process
if (xulRuntime.processType == 2) {
addEventListener("contentEvent", function (e) { ipcEvent(e); }, false, true);
}
var ipctest = {};
ipctest.waitForFocus_started = false;
ipctest.waitForFocus_loaded = false;
ipctest.waitForFocus_focused = false;
ipctest.waitForFocus = function (callback, targetWindow, expectBlankPage) {
if (targetWindow && targetWindow != undefined) {
var tempID = targetWindow;
targetWindow = null;
var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
.getService(Ci.nsIWindowMediator);
var wm_enum = wm.getXULWindowEnumerator(null);
while(wm_enum.hasMoreElements()) {
var win = wm_enum.getNext().QueryInterface(Ci.nsIXULWindow)
.docShell.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow)
.content.wrappedJSObject;
var domutils = win.QueryInterface(Ci.nsIInterfaceRequestor).
getInterface(Ci.nsIDOMWindowUtils);
if (domutils.outerWindowID == tempID) {
targetWindow = win;
}
}
}
if (targetWindow == null || targetWindow == undefined)
if (content)
targetWindow = content.document.defaultView;
else
targetWindow = window;
ipctest.waitForFocus_started = false;
expectBlankPage = !!expectBlankPage;
var fm = Cc["@mozilla.org/focus-manager;1"].
getService(Ci.nsIFocusManager);
var childTargetWindow = { };
fm.getFocusedElementForWindow(targetWindow, true, childTargetWindow);
childTargetWindow = childTargetWindow.value;
function debugFocusLog(prefix) {
if (content)
var wrapper = content.wrappedJSObject.frames[0].SimpleTest;
else
var wrapper = SimpleTest;
wrapper.ok(true, prefix + " -- loaded: " + targetWindow.document.readyState +
" active window: " +
(fm.activeWindow ? "(" + fm.activeWindow + ") " + fm.activeWindow.location : "<no window active>") +
" focused window: " +
(fm.focusedWindow ? "(" + fm.focusedWindow + ") " + fm.focusedWindow.location : "<no window focused>") +
" desired window: (" + targetWindow + ") " + targetWindow.location +
" child window: (" + childTargetWindow + ") " + childTargetWindow.location);
}
debugFocusLog("before wait for focus");
function maybeRunTests() {
debugFocusLog("maybe run tests <load:" +
ipctest.waitForFocus_loaded + ", focus:" + ipctest.waitForFocus_focused + ">");
if (ipctest.waitForFocus_loaded &&
ipctest.waitForFocus_focused &&
!ipctest.waitForFocus_started) {
ipctest.waitForFocus_started = true;
if (content)
content.setTimeout(function() { callback(); }, 0, targetWindow);
else
setTimeout(function() { callback(); }, 0, targetWindow);
}
}
function waitForEvent(event) {
try {
debugFocusLog("waitForEvent called <type:" + event.type + ", target" + event.target + ">");
// Check to make sure that this isn't a load event for a blank or
// non-blank page that wasn't desired.
if (event.type == "load" && (expectBlankPage != (event.target.location == "about:blank")))
return;
ipctest["waitForFocus_" + event.type + "ed"] = true;
var win = (event.type == "load") ? targetWindow : childTargetWindow;
win.removeEventListener(event.type, waitForEvent, true);
maybeRunTests();
} catch (e) {
}
}
// If the current document is about:blank and we are not expecting a blank
// page (or vice versa), and the document has not yet loaded, wait for the
// page to load. A common situation is to wait for a newly opened window
// to load its content, and we want to skip over any intermediate blank
// pages that load. This issue is described in bug 554873.
ipctest.waitForFocus_loaded =
(expectBlankPage == (targetWindow.location == "about:blank")) &&
targetWindow.document.readyState == "complete";
if (!ipctest.waitForFocus_loaded) {
targetWindow.addEventListener("load", waitForEvent, true);
}
// Check if the desired window is already focused.
var focusedChildWindow = { };
if (fm.activeWindow) {
fm.getFocusedElementForWindow(fm.activeWindow, true, focusedChildWindow);
focusedChildWindow = focusedChildWindow.value;
}
// If this is a child frame, ensure that the frame is focused.
ipctest.waitForFocus_focused = (focusedChildWindow == childTargetWindow);
if (ipctest.waitForFocus_focused) {
maybeRunTests();
}
else {
//TODO: is this really the childTargetWindow
// and are we really doing something with it here?
if (content) {
var wr = childTargetWindow.wrappedJSObject;
wr.addEventListener("focus", waitForEvent, true);
sendAsyncMessage("chromeEvent", {"type":"Focus", "data":{}});
wr.focus();
} else {
childTargetWindow.addEventListener("focus", waitForEvent, true);
childTargetWindow.focus();
}
}
};

3
testing/mochitest/jar.mn
View File

@ -6,8 +6,6 @@ mochikit.jar:
content/chrome-harness.js (chrome-harness.js)
content/harness-overlay.xul (harness-overlay.xul)
content/harness.xul (harness.xul)
content/ipc.js (ipc.js)
content/ipc-overlay.xul (ipc-overlay.xul)
content/mozprefs.js (mozprefs.js)
content/redirect.html (redirect.html)
content/server.js (server.js)
@ -21,7 +19,6 @@ mochikit.jar:
content/tests/SimpleTest/MozillaLogger.js (tests/SimpleTest/MozillaLogger.js)
content/tests/SimpleTest/LogController.js (tests/SimpleTest/LogController.js)
content/tests/SimpleTest/PluginUtils.js (tests/SimpleTest/PluginUtils.js)
content/tests/SimpleTest/quit.js (tests/SimpleTest/quit.js)
content/tests/SimpleTest/setup.js (tests/SimpleTest/setup.js)
content/tests/SimpleTest/SimpleTest.js (tests/SimpleTest/SimpleTest.js)
content/tests/SimpleTest/test.css (tests/SimpleTest/test.css)

1
testing/mochitest/plain-loop.html
View File

@ -4,7 +4,6 @@
<script type="text/javascript" src="/tests/SimpleTest/LogController.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/TestRunner.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/MozillaFileLogger.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/quit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/setup.js"></script>
</head>
<script type="text/javascript">

10
testing/mochitest/runtests.py
View File

@ -561,7 +561,7 @@ class Mochitest(object):
URL parameters to test URL:
autorun -- kick off tests automatically
closeWhenDone -- runs quit.js after tests
closeWhenDone -- closes the browser after the tests
hideResultsTable -- hides the table of individual test results
logFile -- logs test run to an absolute path
totalChunks -- how many chunks to split tests into
@ -812,17 +812,9 @@ toolbar#nav-bar {
chrome += """
overlay chrome://browser/content/browser.xul chrome://mochikit/content/browser-test-overlay.xul
overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/browser-test-overlay.xul
"""
else:
#only do the ipc-overlay.xul for mochitest-plain.
#Currently there are focus issues in chrome tests and issues with new windows and dialogs when using ipc
chrome += """
overlay chrome://browser/content/browser.xul chrome://mochikit/content/ipc-overlay.xul
overlay chrome://navigator/content/navigator.xul chrome://mochikit/content/ipc-overlay.xul
"""
self.installChromeJar(jarDir, chrome, options)
return manifest
def installChromeJar(self, jarDirName, chrome, options):

2
testing/mochitest/server.js
View File

@ -621,8 +621,6 @@ function testListing(metadata, response)
src: "/tests/SimpleTest/TestRunner.js"}),
SCRIPT({type: "text/javascript",
src: "/tests/SimpleTest/MozillaLogger.js"}),
SCRIPT({type: "text/javascript",
src: "/tests/SimpleTest/quit.js"}),
SCRIPT({type: "text/javascript",
src: "/tests/SimpleTest/setup.js"}),
SCRIPT({type: "text/javascript"},

5
testing/mochitest/specialpowers/components/SpecialPowersObserver.js
View File

@ -89,6 +89,7 @@ SpecialPowersObserver.prototype = new SpecialPowersObserverAPI();
this._messageManager.addMessageListener("SPPrefService", this);
this._messageManager.addMessageListener("SPProcessCrashService", this);
this._messageManager.addMessageListener("SPPingService", this);
this._messageManager.addMessageListener("SpecialPowers.Quit", this);
this._messageManager.loadFrameScript(CHILD_LOGGER_SCRIPT, true);
this._messageManager.loadFrameScript(CHILD_SCRIPT_API, true);
@ -171,6 +172,10 @@ SpecialPowersObserver.prototype = new SpecialPowersObserverAPI();
.sendAsyncMessage("SPPingService", { op: "pong" });
}
break;
case "SpecialPowers.Quit":
let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
appStartup.quit(Ci.nsIAppStartup.eForceQuit);
break;
default:
return this._receiveMessage(aMessage);
}

4
testing/mochitest/specialpowers/content/specialpowers.js
View File

@ -100,6 +100,10 @@ SpecialPowers.prototype._messageReceived = function(aMessage) {
return true;
};
SpecialPowers.prototype.quit = function() {
sendAsyncMessage("SpecialPowers.Quit", {});
};
SpecialPowers.prototype.executeAfterFlushingMessageQueue = function(aCallback) {
this._pongHandlers.push(aCallback);
sendAsyncMessage("SPPingService", { op: "ping" });

11
testing/mochitest/tests/SimpleTest/ChromePowers.js
View File

@ -78,6 +78,10 @@ ChromePowers.prototype.unregisterProcessCrashObservers = function() {
ChromePowers.prototype._receiveMessage = function(aMessage) {
switch (aMessage.name) {
case "SpecialPowers.Quit":
let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
appStartup.quit(Ci.nsIAppStartup.eForceQuit);
break;
case "SPProcessCrashService":
if (aMessage.json.op == "register-observer" || aMessage.json.op == "unregister-observer") {
// Hack out register/unregister specifically for browser-chrome leaks
@ -96,6 +100,13 @@ ChromePowers.prototype._receiveMessage = function(aMessage) {
}
};
ChromePowers.prototype.quit = function() {
// We come in here as SpecialPowers.quit, but SpecialPowers is really ChromePowers.
// For some reason this.<func> resolves to TestRunner, so using SpecialPowers
// allows us to use the ChromePowers object which we defined below.
SpecialPowers._sendSyncMessage("SpecialPowers.Quit", {});
};
ChromePowers.prototype.executeAfterFlushingMessageQueue = function(aCallback) {
aCallback();
};

1
testing/mochitest/tests/SimpleTest/Makefile.in
View File

@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_SIMPLETEST_FILES = MozillaLogger.js \
LogController.js \
quit.js \
SimpleTest.js \
test.css \
TestRunner.js \

8
testing/mochitest/tests/SimpleTest/SimpleTest.js
View File

@ -34,14 +34,6 @@ if (window.SpecialPowers == undefined && window.opener && window.opener.SpecialP
window.SpecialPowers = window.opener.SpecialPowers;
}
// Running in e10s build and need to use IPC?
var ipcMode = false;
if (parentRunner) {
ipcMode = parentRunner.ipcMode;
} else if (typeof SpecialPowers != 'undefined') {
ipcMode = SpecialPowers.hasContentProcesses();
}
/* Helper functions pulled out of various MochiKit modules */
if (typeof(repr) == 'undefined') {
function repr(o) {

9
testing/mochitest/tests/SimpleTest/TestRunner.js
View File

@ -24,10 +24,6 @@ function contentDispatchEvent(type, data, sync) {
document.dispatchEvent(element);
}
function contentSyncEvent(type, data) {
contentDispatchEvent(type, data, 1);
}
function contentAsyncEvent(type, data) {
contentDispatchEvent(type, data, 0);
}
@ -83,7 +79,6 @@ TestRunner._urls = [];
TestRunner.timeout = 5 * 60 * 1000; // 5 minutes.
TestRunner.maxTimeouts = 4; // halt testing after too many timeouts
TestRunner.ipcMode = SpecialPowers.hasContentProcesses();
TestRunner._expectingProcessCrash = false;
/**
@ -182,9 +177,7 @@ TestRunner._makeIframe = function (url, retry) {
// typically calling ourselves from setTimeout is sufficient
// but we'll try focus() just in case that's needed
if (TestRunner.ipcMode) {
contentAsyncEvent("Focus");
}
contentAsyncEvent("Focus");
window.focus();
iframe.focus();
if (retry < 3) {

107
testing/mochitest/tests/SimpleTest/quit.js
View File

@ -1,107 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Automated Testing Code.
*
* The Initial Developer of the Original Code is
* Mozilla Corporation.
* Portions created by the Initial Developer are Copyright (C) 2005
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Bob Clary <bob@bclary.com>
* Jeff Walden <jwalden+code@mit.edu>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/*
From mozilla/toolkit/content
These files did not have a license
*/
//Simple test to see if we are running in e10s IPC
var ipcMode = false;
if (typeof(TestRunner) != "undefined") {
ipcMode = TestRunner.ipcMode;
}
function quitHook()
{
var xhr = new XMLHttpRequest();
xhr.open("GET", "http://" + location.host + "/server/shutdown", true);
xhr.onreadystatechange = function (event)
{
if (xhr.readyState == 4)
goQuitApplication();
};
xhr.send(null);
}
function canQuitApplication()
{
var os = Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService);
if (!os)
{
return true;
}
try
{
var cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"]
.createInstance(Components.interfaces.nsISupportsPRBool);
os.notifyObservers(cancelQuit, "quit-application-requested", null);
// Something aborted the quit process.
if (cancelQuit.data)
{
return false;
}
}
catch (ex)
{
}
return true;
}
function goQuitApplication()
{
if (ipcMode) {
contentAsyncEvent("QuitApplication");
return;
}
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
if (!canQuitApplication()) {
return false;
}
var appService = Components.classes['@mozilla.org/toolkit/app-startup;1']
.getService(Components.interfaces.nsIAppStartup);
appService.quit(Components.interfaces.nsIAppStartup.eForceQuit);
return true;
}

4
testing/mochitest/tests/SimpleTest/setup.js
View File

@ -113,9 +113,9 @@ if (params.repeat) {
TestRunner.repeat = params.repeat;
}
// closeWhenDone tells us to call quit.js when complete
// closeWhenDone tells us to close the browser when complete
if (params.closeWhenDone) {
TestRunner.onComplete = goQuitApplication;
TestRunner.onComplete = SpecialPowers.quit;
}
// logFile to write our results

5
testing/mochitest/tests/index.html
View File

@ -4,7 +4,6 @@
<script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="SimpleTest/TestRunner.js"></script>
<script type="text/javascript" src="SimpleTest/MozillaLogger.js"></script>
<script type="text/javascript" src="SimpleTest/quit.js"></script>
<!--<link rel="stylesheet" type="text/css" href="/static/main.css" />-->
</head>
<body>
@ -22,9 +21,9 @@ var params = parseQueryString(location.search.substring(1), true);
var fileLevel = params.fileLevel || null;
var consoleLevel = params.consoleLevel || null;
// closeWhenDone tells us to call quit.js when complete
// closeWhenDone tells us to close the browser when complete
if (params.closeWhenDone) {
TestRunner.onComplete = goQuitApplication;
TestRunner.onComplete = SpecialPowers.quit;
}
// logFile to write our results