corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset a5e2394cd75d

Browse Source
This commit is contained in:
Steve Fink
2011-05-12 11:13:14 -07:00
parent f6a3720827
commit dba618560e
11 changed files with 14 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
layout/tools/reftest/reftest.js
View File

@@ -547,7 +547,7 @@ function ReadManifest(aURL, inherited_status)
}
var streamBuf = getStreamContent(inputStream);
inputStream.close();
var lines = streamBuf.split(/\n|\r|\r\n/);
var lines = streamBuf.split(/(\n|\r|\r\n)/);
// Build the sandbox for fails-if(), etc., condition evaluation.
var sandbox = BuildConditionSandbox(aURL);
@@ -581,7 +581,7 @@ function ReadManifest(aURL, inherited_status)
var needs_focus = false;
var slow = false;
while (items[0].match(/^(fails|needs-focus|random|skip|asserts|slow|require-or|silentfail)/)) {
while (items[0].match(/^(fails|needs-focus|random|skip|asserts|slow|silentfail)/)) {
var item = items.shift();
var stat;
var cond;
@@ -612,30 +612,6 @@ function ReadManifest(aURL, inherited_status)
} else if (item == "slow") {
cond = false;
slow = true;
} else if ((m = item.match(/^require-or\((.*?)\)$/))) {
var args = m[1].split(/,/);
if (args.length != 2) {
throw "Error 7 in manifest file " + aURL.spec + " line " + lineNo + ": wrong number of args to require-or";
}
var [precondition_str, fallback_action] = args;
var preconditions = precondition_str.split(/&&/);
cond = false;
for each (var precondition in preconditions) {
if (precondition === "debugMode") {
// Currently unimplemented. Requires asynchronous
// JSD call + getting an event while no JS is running
stat = fallback_action;
cond = true;
break;
} else if (precondition === "true") {
// For testing
} else {
// Unknown precondition. Assume it is unimplemented.
stat = fallback_action;
cond = true;
break;
}
}
} else if ((m = item.match(/^slow-if\((.*?)\)$/))) {
cond = false;
if (Components.utils.evalInSandbox("(" + m[1] + ")", sandbox))