git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6bcea06)
Reviewed by Darin.
authorap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Apr 2006 04:40:48 +0000 (04:40 +0000)
committerap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Apr 2006 04:40:48 +0000 (04:40 +0000)
        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=8157
          Make HTTP tests using Perl use .pl extension

WebKitTools:
        * Scripts/run-webkit-tests: Added support for running .pl and .php tests,
          removed support for .text. Reduced the number of places that explicitly list supported
          extensions. Some of the changes come from bug 8121, the patch for which got landed only
          partially.

LayoutTests:
        * http/tests/incremental/slow-utf8-text.pl: Added (renamed from .text).
        * http/tests/incremental/slow-utf8-text.text: Removed.
        * http/tests/incremental/split-hex-entities.pl: Added (renamed from .html).
        * http/tests/incremental/split-hex-entities.html: Removed.
        * http/tests/incremental/.htaccess: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13818 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/http/tests/incremental/.htaccess [deleted file] patch | blob | history
LayoutTests/http/tests/incremental/slow-utf8-text.pl [moved from LayoutTests/http/tests/incremental/slow-utf8-text.text with 67% similarity] patch | blob | history
LayoutTests/http/tests/incremental/split-hex-entities.pl [moved from LayoutTests/http/tests/incremental/split-hex-entities.html with 89% similarity] patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/Scripts/run-webkit-tests patch | blob | history

diff --git a/LayoutTests/http/tests/incremental/.htaccess b/LayoutTests/http/tests/incremental/.htaccess
deleted file mode 100644 (file)
index 3d9d1ab..0000000
--- a/LayoutTests/http/tests/incremental/.htaccess
+++ /dev/null
@@ -1,13 +0,0 @@
-<Files "slow-utf8-text.text">
-  AddType text/plain .text
-  AddHandler cgi-script .text
-  Header set Expires "Thu, 01 Dec 2003 16:00:00 GMT"
-  Header set Cache-Control "no-store, no-cache, must-revalidate"
-  Header set Pragma "no-cache"
-</Files>
-<Files "split-hex-entities.html">
-  AddHandler cgi-script .html
-  Header set Expires "Thu, 01 Dec 2003 16:00:00 GMT"
-  Header set Cache-Control "no-store, no-cache, must-revalidate"
-  Header set Pragma "no-cache"
-</Files>
diff --git a/LayoutTests/http/tests/incremental/slow-utf8-text.text b/LayoutTests/http/tests/incremental/slow-utf8-text.pl
similarity index 67%
rename from LayoutTests/http/tests/incremental/slow-utf8-text.text
rename to LayoutTests/http/tests/incremental/slow-utf8-text.pl
index 9f653c9d80b7de316277ef01391636d9a2b496a2..5c7e8819c68fc8b0becda5106d606a69425a7f17 100755 (executable)
--- a/LayoutTests/http/tests/incremental/slow-utf8-text.text
+++ b/LayoutTests/http/tests/incremental/slow-utf8-text.pl
@@ -4,7 +4,12 @@
 select (STDOUT);
 $| = 1;
 
-print "Content-Type: text/plain\n\n";
+print "Content-Type: text/plain\n";
+print "Expires: Thu, 01 Dec 2003 16:00:00 GMT\n";
+print "Cache-Control: no-store, no-cache, must-revalidate\n";
+print "Pragma: no-cache\n";
+print "\n";
+
 print "\xef\xbb\xbfTest for bug 5187: UTF-8 in long text files breaks at some point.\n\n";
 for ($count=1; $count<2000; $count++) {
     print "\x65\xcc\x81";
diff --git a/LayoutTests/http/tests/incremental/split-hex-entities.html b/LayoutTests/http/tests/incremental/split-hex-entities.pl
similarity index 89%
rename from LayoutTests/http/tests/incremental/split-hex-entities.html
rename to LayoutTests/http/tests/incremental/split-hex-entities.pl
index faa9ef6debfc561daf029f0142c70378e4f4a101..0618d921ed5bfbf79f20d6ccb2588afd1823751b 100755 (executable)
--- a/LayoutTests/http/tests/incremental/split-hex-entities.html
+++ b/LayoutTests/http/tests/incremental/split-hex-entities.pl
@@ -4,7 +4,11 @@
 select (STDOUT);
 $| = 1;
 
-print "Content-Type: text/html\n\n";
+print "Content-Type: text/html\n";
+print "Expires: Thu, 01 Dec 2003 16:00:00 GMT\n";
+print "Cache-Control: no-store, no-cache, must-revalidate\n";
+print "Pragma: no-cache\n";
+print "\n";
 
 print "<body>\n";
 print "<script>\n";
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3f9589d8664f4dfd9adb26b49593ae067e03c89b..f4dec0a379ea7c6fda3b2c6bc96edaa2af1eb5c0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-10  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=8157
+          Make HTTP tests using Perl use .pl extension
+
+        * Scripts/run-webkit-tests: Added support for running .pl and .php tests,
+          removed support for .text. Reduced the number of places that explicitly list supported
+          extensions. Some of the changes come from bug 8121, the patch for which got landed only
+          partially.
+
 2006-04-06  Darin Adler  <darin@apple.com>
 
         Changes requested by Mark Rowe.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index de5ea5a1cda88475b6dbbdc6b53571c87240b22a..09aa0ccabf8ea379880e0b24461e97edfc088b75 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -30,7 +30,7 @@
 # Script to run the Web Kit Open Source Project layout tests.
 
 # Run all the tests passed in on the command line.
-# If no tests are passed, find all the .html, .shtml, .text, .xml, .xhtml (and svg) files in the test directory.
+# If no tests are passed, find all the .html, .shtml, .xml, .xhtml, .pl, .php (and svg) files in the test directory.
 
 # Run each text.
 # Compare against the existing file xxx-expected.txt.
@@ -135,7 +135,7 @@ print "Running tests from $testDirectory\n";
 my @tests = ();
 
 my $prunePart = "\\( -name resources \\! -prune \\)";
-my $extensionPart = "-name '*.html' -or -name '*.shtml' -or -name '*.text' -or -name '*.xml' -or -name '*.xhtml'";
+my $extensionPart = "-name '*.html' -or -name '*.shtml' -or -name '*.xml' -or -name '*.xhtml' -or -name '*.pl' -or -name '*.php'";
 if ($testOnlySVGs) {
     $extensionPart = "-name '*.svg' -or -name '*.xml'";
 } elsif (checkWebCoreSVGSupport($testOnlySVGs)) { 
@@ -156,7 +156,7 @@ for my $test (@ARGV) {
     if ($test =~ /^\//) {
         print "can't run test outside $testDirectory\n";
     } elsif (-f "$testDirectory/$test") {
-        if ($test !~ /\.(html|shtml|text|xml|xhtml|svg)$/) {
+        if ($test !~ /\.(html|shtml|xml|xhtml|pl|php|svg)$/) {
             print "test $test does not have a supported extension\n";
         } elsif ($testHTTP || $test !~ /^http\//) {
             push @tests, $test;
@@ -214,7 +214,7 @@ for my $test (@tests) {
     openDumpRenderTreeIfNeeded();
 
     my $base = $test;
-    $base =~ s/\.(html|shtml|text|xml|xhtml|svg)$//;
+    $base =~ s/\.[a-zA-Z]+$//;
     
     if ($verbose || $singly) {
         print "running $test -> ";
@@ -523,7 +523,7 @@ if ($counts{mismatch}) {
     print HTML "<table>\n";
     for my $test (@{$tests{mismatch}}) {
         my $base = $test;
-        $base =~ s/\.(html|shtml|text|xml|xhtml|svg)$//;
+        $base =~ s/\.[a-zA-Z]+$//;
         copy("$testDirectory/$base-expected.txt", "$testResultsDirectory/$base-expected.txt");
         print HTML "<tr>\n";            
         print HTML "<td><a href=\"$testDirectory/$test\">$base</a></td>\n";
@@ -552,7 +552,7 @@ if ($counts{fail}) {
     print HTML "<table>\n";
     for my $test (@{$tests{fail}}) {
         my $base = $test;
-        $base =~ s/\.(html|shtml|text|xml|xhtml|svg)$//;
+        $base =~ s/\.[a-zA-Z]+$//;
         print HTML "<tr>\n";
         print HTML "<td><a href=\"$testDirectory/$test\">$base</a></td>\n";
         print HTML "</tr>\n";
@@ -565,7 +565,7 @@ if ($counts{new}) {
     print HTML "<table>\n";
     for my $test (@{$tests{new}}) {
         my $base = $test;
-        $base =~ s/\.(html|shtml|text|xml|xhtml|svg)$//;
+        $base =~ s/\.[a-zA-Z]+$//;
         print HTML "<tr>\n";
         print HTML "<td><a href=\"$testDirectory/$test\">$base</a></td>\n";
         print HTML "<td><a href=\"$testDirectory/$base-expected.txt\">results</a></td>\n";
Mirror of the WebKit open source project from svn.webkit.org.