Commit e66236b4 authored by ossy@webkit.org's avatar ossy@webkit.org

[ORWT] Fix --reset-results --add-platform-exceptions combo

https://bugs.webkit.org/show_bug.cgi?id=65464

Patch by Kristóf Kosztyó <Kosztyo.Kristof@stud.u-szeged.hu> on 2011-08-22
Reviewed by Csaba Osztrogonác.

* Scripts/old-run-webkit-tests:

git-svn-id: svn://svn.chromium.org/blink/trunk@93502 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 6de128d0
2011-08-22 Kristóf Kosztyó <Kosztyo.Kristof@stud.u-szeged.hu>
[ORWT] Fix --reset-results --add-platform-exceptions combo
https://bugs.webkit.org/show_bug.cgi?id=65464
Reviewed by Csaba Osztrogonác.
* Scripts/old-run-webkit-tests:
2011-08-20 Adam Barth <abarth@webkit.org> 2011-08-20 Adam Barth <abarth@webkit.org>
garden-o-matic summary.html should have UI for examining failures garden-o-matic summary.html should have UI for examining failures
...@@ -954,8 +954,13 @@ for my $test (@tests) { ...@@ -954,8 +954,13 @@ for my $test (@tests) {
} }
if ($resetResults || !-f $expectedPNGPath) { if ($resetResults || !-f $expectedPNGPath) {
mkpath catfile($expectedPixelDir, dirname($base)) if $testDirectory ne $expectedPixelDir; if (!$addPlatformExceptions) {
writeToFile($expectedPNGPath, $actualPNG); mkpath catfile($expectedPixelDir, dirname($base)) if $testDirectory ne $expectedPixelDir;
writeToFile($expectedPNGPath, $actualPNG);
} else {
mkpath catfile($platformTestDirectory, dirname($base));
writeToFile("$platformTestDirectory/$base-$expectedTag.png", $actualPNG);
}
} }
} }
...@@ -969,8 +974,13 @@ for my $test (@tests) { ...@@ -969,8 +974,13 @@ for my $test (@tests) {
$result = "new"; $result = "new";
if ($generateNewResults || $resetResults) { if ($generateNewResults || $resetResults) {
mkpath catfile($expectedDir, dirname($base)) if $testDirectory ne $expectedDir; if (!$addPlatformExceptions) {
writeToFile("$expectedDir/$expectedFileName", $actual); mkpath catfile($expectedDir, dirname($base)) if $testDirectory ne $expectedDir;
writeToFile("$expectedDir/$expectedFileName", $actual);
} else {
mkpath catfile($platformTestDirectory, dirname($base));
writeToFile("$platformTestDirectory/$expectedFileName", $actual);
}
} }
deleteExpectedAndActualResults($base); deleteExpectedAndActualResults($base);
recordActualResultsAndDiff($base, $actual); recordActualResultsAndDiff($base, $actual);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment