Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow reftest harness to load files without any image comparison. b=397725 r=jwalden

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@237208 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org 2007-10-03 21:27:04 +00:00
parent fa1edeed5e
commit 310ff1abc3
2 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/tools/reftest/README.txt
View File

@ -108,10 +108,14 @@ comments) must be one of the following:
c. <type> is one of the following:
== The test passes if the images of the two renderings are the
SAME.
!= The test passes if the images of the two renderings are
DIFFERENT.
== The test passes if the images of the two renderings are the
SAME.
!= The test passes if the images of the two renderings are
DIFFERENT.
load The test passes unconditionally if the page loads. url_ref
must be omitted, and the test cannot be marked as fails or
random. (Used to test for crashes, hangs, assertions, and
leaks.)
d. <url> is either a relative file path or an absolute URL for the
test page

60
mozilla/layout/tools/reftest/reftest.js
View File

@ -68,6 +68,8 @@ const EXPECTED_PASS = 0;
const EXPECTED_FAIL = 1;
const EXPECTED_RANDOM = 2;
const EXPECTED_DEATH = 3; // test must be skipped to avoid e.g. crash/hang
const EXPECTED_LOAD = 4; // test without a reference (just test that it does
// not assert, crash, hang, or leak)
const HTTP_SERVER_PORT = 4444;
@ -191,12 +193,33 @@ function ReadManifest(aURL)
secMan.checkLoadURI(aURL, incURI,
CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
ReadManifest(incURI);
} else if (items[0] == "load") {
if (expected_status == EXPECTED_PASS)
expected_status = EXPECTED_LOAD;
if (items.length != 2 ||
(expected_status != EXPECTED_LOAD &&
expected_status != EXPECTED_DEATH))
throw "Error in manifest file " + aURL.spec + " line " + lineNo;
var [testURI] = runHttp
? ServeFiles(aURL,
listURL.file.parent, [items[1]])
: [gIOService.newURI(items[1], null, listURL)];
var prettyPath = runHttp
? gIOService.newURI(items[1], null, listURL).spec
: testURI.spec;
secMan.checkLoadURI(aURL, testURI,
CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
gURLs.push( { equal: true /* meaningless */,
expected: expected_status,
prettyPath: prettyPath,
url1: testURI,
url2: null } );
} else if (items[0] == "==" || items[0] == "!=") {
if (items.length != 3)
throw "Error in manifest file " + aURL.spec + " line " + lineNo;
var [testURI, refURI] = runHttp
? ServeFiles(aURL,
listURL.file.parent, items[1], items[2])
listURL.file.parent, [items[1], items[2]])
: [gIOService.newURI(items[1], null, listURL),
gIOService.newURI(items[2], null, listURL)];
var prettyPath = runHttp
@ -217,7 +240,7 @@ function ReadManifest(aURL)
} while (more);
}
function ServeFiles(manifestURL, directory, file1, file2)
function ServeFiles(manifestURL, directory, files)
{
if (!gServer)
gServer = CC["@mozilla.org/server/jshttp;1"].
@ -227,23 +250,23 @@ function ServeFiles(manifestURL, directory, file1, file2)
var path = "/" + gCount + "/";
gServer.registerDirectory(path, directory);
var testURI = gIOService.newURI("http://localhost:" + HTTP_SERVER_PORT +
path + file1,
null, null);
var refURI = gIOService.newURI("http://localhost:" + HTTP_SERVER_PORT +
path + file2,
null, null);
var secMan = CC[NS_SCRIPTSECURITYMANAGER_CONTRACTID]
.getService(CI.nsIScriptSecurityManager);
// XXX necessary? manifestURL guaranteed to be file, others always HTTP
secMan.checkLoadURI(manifestURL, testURI,
CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
secMan.checkLoadURI(manifestURL, refURI,
CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
function FileToURI(file)
{
var testURI = gIOService.newURI("http://localhost:" + HTTP_SERVER_PORT +
path + file,
null, null);
return [testURI, refURI];
// XXX necessary? manifestURL guaranteed to be file, others always HTTP
secMan.checkLoadURI(manifestURL, testURI,
CI.nsIScriptSecurityManager.DISALLOW_SCRIPT);
return testURI;
}
return files.map(FileToURI);
}
function StartCurrentTest()
@ -346,6 +369,13 @@ function DocumentLoaded()
{
clearTimeout(gFailureTimeout);
if (gURLs[0].expected == EXPECTED_LOAD) {
dump("REFTEST PASS (LOAD ONLY): " + gURLs[0].prettyPath + "\n");
gURLs.shift();
StartCurrentTest();
return;
}
var canvas;
if (gState == 1)