Bug #: 4907

Submitted by: eseidel
Reviewed by: hyatt
        * DumpRenderTree/DumpRenderTree.m:
        (dump): updated error message
        * Scripts/check-dom-results: now includes xhtml
        Tool updates for xhtml.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=4907

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1f641d7c070dd27a39b64ee9471ea88020b9c41c..12a024cbcac9252a3c2546e6387ab4308cc7e3bc 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-26  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt.
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (dump): updated error message
+        * Scripts/check-dom-results: now includes xhtml
+        Tool updates for xhtml.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=4907
+
 2005-09-22  Duncan Wilcox  <duncan@mclink.it>
 
         Reviewed by Maciej.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.m b/WebKitTools/DumpRenderTree/DumpRenderTree.m
index bc5568fb76b8b4a3dd679775e6fad28fbf9d83af..5f5230b94eae5f43acc7f21da164d8f17bdfab92 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.m
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.m
@@ -199,7 +199,7 @@ static void dump(void)
             result = [frame renderTreeAsExternalRepresentation];
         
         if (!result)
-            puts("error");
+            printf("ERROR: nil result from %s", dumpAsText ? "[documentElement innerText]" : "[frame renderTreeAsExternalRepresentation]");
         else
             fputs([result UTF8String], stdout);
         

diff --git a/WebKitTools/Scripts/check-dom-results b/WebKitTools/Scripts/check-dom-results
index bba9373037915b5bc5d35aaade9b7780457bb1da..2fb46c703e438623767b82cd0bab8702b8855c6b 100755 (executable)
--- a/WebKitTools/Scripts/check-dom-results
+++ b/WebKitTools/Scripts/check-dom-results
@@ -43,9 +43,14 @@ my $WebCoreDirectory = "$workingDir/WebCore";
 my $testDirectory = "$WebCoreDirectory/layout-tests";
 
 my @suites = ( {"name" => "DOM Level 1 Core   (html)", "directory" => "dom/html/level1/core"},
-              {"name" => "DOM Level 2 Core   (html)", "directory" => "dom/html/level2/core"},
-              {"name" => "DOM Level 2 Events (html)", "directory" => "dom/html/level2/events"},
-              {"name" => "DOM Level 2 HTML   (html)", "directory" => "dom/html/level2/html"} );
+               {"name" => "DOM Level 2 Core   (html)", "directory" => "dom/html/level2/core"},
+               {"name" => "DOM Level 2 Events (html)", "directory" => "dom/html/level2/events"},
+               {"name" => "DOM Level 2 HTML   (html)", "directory" => "dom/html/level2/html"},
+               {"name" => "DOM Level 1 Core   (xhtml)", "directory" => "dom/xhtml/level1/core"},
+               {"name" => "DOM Level 2 Core   (xhtml)", "directory" => "dom/xhtml/level2/core"},
+               {"name" => "DOM Level 2 Events (xhtml)", "directory" => "dom/xhtml/level2/events"},
+               {"name" => "DOM Level 2 HTML   (xhtml)", "directory" => "dom/xhtml/level2/html"},
+               {"name" => "DOM Level 3 Core   (xhtml)", "directory" => "dom/xhtml/level3/core"});
 
 my $totalCount = 0;
 my $totalSuccesses = 0;
@@ -58,7 +63,7 @@ foreach my $suite (@suites) {
     my $directory = $suite{"directory"};
     my $name = $suite{"name"};
     my @results = `find "${testDirectory}/${directory}" -name "*-expected.txt"`;
-    my @disabled = `find "${testDirectory}/${directory}" -name "*.html-disabled"`;
+    my @disabled = `find "${testDirectory}/${directory}" -name "*-disabled"`;
 
     my @failures = ();
     my $count = 0;
@@ -88,10 +93,12 @@ foreach my $suite (@suites) {
     my $percentage = (sprintf "%.1f", ($successCount * 100.0 / $count));
     
     if ($percentage == 100) {
-        print "${name}: all ${count} tests succeeded\n";
+        print "${name}: all ${count} tests succeeded";
     } else {
-        print "${name}: ${successCount} out of ${count} tests succeeded (${percentage}%)\n";
+        print "${name}: ${successCount} out of ${count} tests succeeded (${percentage}%)";
     }
+    print " ($disabledCount disabled)" if $disabledCount;
+    print "\n";
     if ($verbose) {
        print "\n";
        if (@disabled) {