mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 15:25:52 +00:00
Display reftest images on unexpected passes. Bug 403012, r=dbaron, a=schrep
This commit is contained in:
parent
9346fcb9dc
commit
e0e95177d8
@ -56,8 +56,8 @@ while (<>) {
|
||||
next unless /REFTEST/;
|
||||
chomp;
|
||||
chop if /\r$/;
|
||||
s,(PASS|FAIL):( \(!=\))? (.*),\1:\2 <a href="\3">\3</a>,;
|
||||
s,(IMAGE [^:]*): (data:.*),<a href="\2">\1</a>,;
|
||||
s,(PASS|FAIL)([^:]*):( \(!=\))? (.*),\1\2:\3 <a href="\4">\4</a>,;
|
||||
s,(IMAGE[^:]*): (data:.*),<a href="\2">\1</a>,;
|
||||
print;
|
||||
print "\n";
|
||||
}
|
||||
|
@ -106,27 +106,30 @@ while (<>) {
|
||||
if (/^PASS(.*)$/) {
|
||||
my $class = $randomresult ? "PASSRANDOM" : "PASS";
|
||||
print '<tr><td class="' . $class . '">' . do_html($1) . "</td></tr>\n";
|
||||
} elsif (/^UNEXPECTED PASS(.*)$/) {
|
||||
my $class = $randomresult ? "PASSRANDOM" : "WEIRDPASS";
|
||||
print '<tr><td class="' . $class . '">' . do_html($1) . "</td></tr>\n";
|
||||
} elsif (/^UNEXPECTED FAIL: (.*)$/) {
|
||||
my $class = $randomresult ? "FAILRANDOM" : "FAIL";
|
||||
print '<tr><td class="' . $class . '">' . do_html($1) . "</td></tr>\n";
|
||||
} elsif (/^UNEXPECTED (....): (.*)$/) {
|
||||
if ($randomresult) {
|
||||
die "Error on line $l: UNEXPECTED with test marked random?!";
|
||||
}
|
||||
my $class = ($1 eq "PASS") ? "WEIRDPASS" : "FAIL";
|
||||
print '<tr><td class="' . $class . '">' . do_html($2) . "</td></tr>\n";
|
||||
|
||||
# FAILs are followed by images
|
||||
# UNEXPECTED results can be followed by one or two images
|
||||
$testline = &readcleanline;
|
||||
$refline = &readcleanline;
|
||||
|
||||
print '<tr><td class="FAILIMAGES">';
|
||||
|
||||
{
|
||||
die "Error on line $l" unless $testline =~ /REFTEST IMAGE 1 \(TEST\): (data:.*)$/;
|
||||
if ($testline =~ /REFTEST IMAGE: (data:.*)$/) {
|
||||
print '<a href="' . $1 . '"><img class="testresult" src="' . $1 . '"></a>';
|
||||
}
|
||||
} elsif ($testline =~ /REFTEST IMAGE 1 \(TEST\): (data:.*)$/) {
|
||||
$refline = &readcleanline;
|
||||
print '<a href="' . $1 . '"><img class="testresult" src="' . $1 . '"></a>';
|
||||
{
|
||||
die "Error on line $l" unless $refline =~ /REFTEST IMAGE 2 \(REFERENCE\): (data:.*)$/;
|
||||
print '<a href="' . $1 . '"><img class="testref" src="' . $1 . '"></a>';
|
||||
}
|
||||
|
||||
{
|
||||
die "Error on line $l" unless $refline =~ /REFTEST IMAGE 2 \(REFERENCE\): (data:.*)$/;
|
||||
print '<a href="' . $1 . '"><img class="testref" src="' . $1 . '"></a>';
|
||||
} else {
|
||||
die "Error on line $l";
|
||||
}
|
||||
|
||||
print "</td></tr>\n";
|
||||
|
@ -436,10 +436,15 @@ function DocumentLoaded()
|
||||
}
|
||||
result += gURLs[0].prettyPath; // the URL being tested
|
||||
dump(result + "\n");
|
||||
if (!test_passed && expected == EXPECTED_PASS) {
|
||||
dump("REFTEST IMAGE 1 (TEST): " + gCanvas1.toDataURL() + "\n");
|
||||
dump("REFTEST IMAGE 2 (REFERENCE): " + gCanvas2.toDataURL() + "\n");
|
||||
dump("REFTEST number of differing pixels: " + differences + "\n");
|
||||
if (!test_passed && expected == EXPECTED_PASS ||
|
||||
test_passed && expected == EXPECTED_FAIL) {
|
||||
if (equal) {
|
||||
dump("REFTEST IMAGE 1 (TEST): " + gCanvas1.toDataURL() + "\n");
|
||||
dump("REFTEST IMAGE 2 (REFERENCE): " + gCanvas2.toDataURL() + "\n");
|
||||
dump("REFTEST number of differing pixels: " + differences + "\n");
|
||||
} else {
|
||||
dump("REFTEST IMAGE: " + gCanvas1.toDataURL() + "\n");
|
||||
}
|
||||
}
|
||||
|
||||
gURLs.shift();
|
||||
|
Loading…
Reference in New Issue
Block a user