Commit 6a7e5023 authored by hayato@chromium.org's avatar hayato@chromium.org

2011-03-15 Hayato Ito <hayato@chromium.org>

        Reviewed by Ojan Vafai.

        Ignore files that will be used by reftests in old-run-webkit-tests.

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

        * Scripts/old-run-webkit-tests:

git-svn-id: svn://svn.chromium.org/blink/trunk@81225 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 898422e2
2011-03-15 Hayato Ito <hayato@chromium.org>
Reviewed by Ojan Vafai.
Ignore files that will be used by reftests in old-run-webkit-tests.
https://bugs.webkit.org/show_bug.cgi?id=55936
* Scripts/old-run-webkit-tests:
2011-03-15 Felipe Oliveira da Silva Netto <f.dachshund@gmail.com> 2011-03-15 Felipe Oliveira da Silva Netto <f.dachshund@gmail.com>
Reviewed by Adam Roben. Reviewed by Adam Roben.
......
...@@ -187,6 +187,7 @@ $testHTTP = 0 if (isWx()); ...@@ -187,6 +187,7 @@ $testHTTP = 0 if (isWx());
my $perlInterpreter = "perl"; my $perlInterpreter = "perl";
my $expectedTag = "expected"; my $expectedTag = "expected";
my $mismatchTag = "mismatch";
my $actualTag = "actual"; my $actualTag = "actual";
my $prettyDiffTag = "pretty-diff"; my $prettyDiffTag = "pretty-diff";
my $diffsTag = "diffs"; my $diffsTag = "diffs";
...@@ -2446,6 +2447,16 @@ sub readSkippedFiles($) ...@@ -2446,6 +2447,16 @@ sub readSkippedFiles($)
my @testsFound; my @testsFound;
sub isUsedInReftest
{
my $filename = $_;
if ($filename =~ /-$expectedTag(-$mismatchTag)?\.html$/) {
return 1;
}
my $base = stripExtension($filename);
return (-f "$base-$expectedTag.html" || -f "$base-$expectedTag-$mismatchTag.html");
}
sub directoryFilter sub directoryFilter
{ {
return () if exists $ignoredLocalDirectories{basename($File::Find::dir)}; return () if exists $ignoredLocalDirectories{basename($File::Find::dir)};
...@@ -2457,7 +2468,8 @@ sub fileFilter ...@@ -2457,7 +2468,8 @@ sub fileFilter
{ {
my $filename = $_; my $filename = $_;
if ($filename =~ /\.([^.]+)$/) { if ($filename =~ /\.([^.]+)$/) {
if (exists $supportedFileExtensions{$1}) { my $extension = $1;
if (exists $supportedFileExtensions{$extension} && !isUsedInReftest($filename)) {
my $path = File::Spec->abs2rel(catfile($File::Find::dir, $filename), $testDirectory); my $path = File::Spec->abs2rel(catfile($File::Find::dir, $filename), $testDirectory);
push @testsFound, $path if !exists $ignoredFiles{$path}; push @testsFound, $path if !exists $ignoredFiles{$path};
} }
......
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