Title: [125604] trunk/Tools
- Revision
- 125604
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-14 14:16:08 -0700 (Tue, 14 Aug 2012)
Log Message
old-run-webkit-tests should skip all file extensions for ref tests, not just .html.
https://bugs.webkit.org/show_bug.cgi?id=93904
Patch by Roger Fong <roger_f...@apple.com> on 2012-08-14
Reviewed by Tim Horton.
old-run-webkit-tests ref test only skipped .html test.
They need to skip .html, .shtml, .xml, .xhtml, .pl, .htm, .php, .svg, .mht.
* Scripts/old-run-webkit-tests:
(isUsedInReftest): Skip all extensions for ref tests.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125603 => 125604)
--- trunk/Tools/ChangeLog 2012-08-14 21:11:33 UTC (rev 125603)
+++ trunk/Tools/ChangeLog 2012-08-14 21:16:08 UTC (rev 125604)
@@ -1,3 +1,16 @@
+2012-08-14 Roger Fong <roger_f...@apple.com>
+
+ old-run-webkit-tests should skip all file extensions for ref tests, not just .html.
+ https://bugs.webkit.org/show_bug.cgi?id=93904
+
+ Reviewed by Tim Horton.
+
+ old-run-webkit-tests ref test only skipped .html test.
+ They need to skip .html, .shtml, .xml, .xhtml, .pl, .htm, .php, .svg, .mht.
+
+ * Scripts/old-run-webkit-tests:
+ (isUsedInReftest): Skip all extensions for ref tests.
+
2012-08-14 Lauro Neto <lauro.n...@openbossa.org>
Convert signals/slots to Q_* macros.
Modified: trunk/Tools/Scripts/old-run-webkit-tests (125603 => 125604)
--- trunk/Tools/Scripts/old-run-webkit-tests 2012-08-14 21:11:33 UTC (rev 125603)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2012-08-14 21:16:08 UTC (rev 125604)
@@ -2560,11 +2560,21 @@
sub isUsedInReftest($)
{
my $filename = $_[0];
- if ($filename =~ /-$expectedTag(-$mismatchTag)?\.html$/) {
+ my @extensions = ('html','shtml','xml','xhtml','htm','php','svg','mht','pl');
+ my $extensionsJoined = join("|", @extensions);
+ my $extensionExpression = "-$expectedTag(-$mismatchTag)?\\.(".$extensionsJoined.")\$";
+
+ if ($filename =~ /$extensionExpression/) {
return 1;
}
my $base = stripExtension($filename);
- return (-f "$base-$expectedTag.html" || -f "$base-$expectedTag-$mismatchTag.html");
+
+ foreach my $extension (@extensions) {
+ if (-f "$base-$expectedTag.$extension" || -f "$base-$expectedTag-$mismatchTag.$extensionsJoined") {
+ return 1;
+ }
+ }
+ return 0;
}
sub directoryFilter
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
