[webkit-changes] cvs commit: WebKitTools/Scripts check-dom-results

[Eric]

eseidel     05/09/26 15:54:24

  Modified:    .        ChangeLog
               DumpRenderTree DumpRenderTree.m
               Scripts  check-dom-results
  Log:
  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
  
  Revision  Changes    Path
  1.106     +10 -0     WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- ChangeLog	24 Sep 2005 13:50:38 -0000	1.105
  +++ ChangeLog	26 Sep 2005 22:54:23 -0000	1.106
  @@ -1,3 +1,13 @@
  +2005-09-26  Eric Seidel  <eseidel at 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 at mclink.it>
   
           Reviewed by Maciej.
  
  
  
  1.17      +1 -1      WebKitTools/DumpRenderTree/DumpRenderTree.m
  
  Index: DumpRenderTree.m
  ===================================================================
  RCS file: /cvs/root/WebKitTools/DumpRenderTree/DumpRenderTree.m,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DumpRenderTree.m	24 Sep 2005 13:50:39 -0000	1.16
  +++ DumpRenderTree.m	26 Sep 2005 22:54:23 -0000	1.17
  @@ -199,7 +199,7 @@
               result = [frame renderTreeAsExternalRepresentation];
           
           if (!result)
  -            puts("error");
  +            printf("ERROR: nil result from %s", dumpAsText ? "[documentElement innerText]" : "[frame renderTreeAsExternalRepresentation]");
           else
               fputs([result UTF8String], stdout);
           
  
  
  
  1.4       +13 -6     WebKitTools/Scripts/check-dom-results
  
  Index: check-dom-results
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/check-dom-results,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- check-dom-results	31 Aug 2005 06:12:14 -0000	1.3
  +++ check-dom-results	26 Sep 2005 22:54:24 -0000	1.4
  @@ -43,9 +43,14 @@
   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 @@
       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 @@
       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) {