[webkit-changes] cvs commit: WebKitTools/Scripts run-webkit-tests

[Darin]

darin       05/09/14 22:13:53

  Modified:    .        ChangeLog
               DumpRenderTree DumpRenderTree.m
               Scripts  run-webkit-tests
  Log:
          - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4291
            dumpAsText doesn't work with XHTML documents
  
          * DumpRenderTree/DumpRenderTree.m: (dump): Dump the innerText of the document element
          rather than of the body element. This works with typical XHTML documents. We can probably
          do something even better in the long run, but this fixes the immediate issue.
  
          - separate tweak
  
          * Scripts/run-webkit-tests: Show the results in the current built Safari by using
          run-safari instead of just using "open", which often runs another copy of Safari instead.
  
  Revision  Changes    Path
  1.100     +14 -0     WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- ChangeLog	11 Sep 2005 17:04:18 -0000	1.99
  +++ ChangeLog	15 Sep 2005 05:13:52 -0000	1.100
  @@ -1,3 +1,17 @@
  +2005-09-14  Darin Adler  <darin at apple.com>
  +
  +        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4291
  +          dumpAsText doesn't work with XHTML documents
  +
  +        * DumpRenderTree/DumpRenderTree.m: (dump): Dump the innerText of the document element
  +        rather than of the body element. This works with typical XHTML documents. We can probably
  +        do something even better in the long run, but this fixes the immediate issue.
  +
  +        - separate tweak
  +
  +        * Scripts/run-webkit-tests: Show the results in the current built Safari by using
  +        run-safari instead of just using "open", which often runs another copy of Safari instead.
  +
   2005-09-11  Mark Rowe  <opendarwin.org at bdash.net.nz>
   
           Reviewed, tweaked, and landed by Darin.
  
  
  
  1.15      +3 -3      WebKitTools/DumpRenderTree/DumpRenderTree.m
  
  Index: DumpRenderTree.m
  ===================================================================
  RCS file: /cvs/root/WebKitTools/DumpRenderTree/DumpRenderTree.m,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DumpRenderTree.m	1 Sep 2005 06:42:58 -0000	1.14
  +++ DumpRenderTree.m	15 Sep 2005 05:13:52 -0000	1.15
  @@ -180,9 +180,9 @@
       NSString *result = nil;
       if (dumpTree) {
           if (dumpAsText) {
  -            DOMDocument *document = [frame DOMDocument];
  -            if ([document isKindOfClass:[DOMHTMLDocument class]])
  -                result = [[[(DOMHTMLDocument *)document body] innerText] stringByAppendingString:@"\n"];
  +            DOMElement *documentElement = [[frame DOMDocument] documentElement];
  +            if ([documentElement isKindOfClass:[DOMHTMLElement class]])
  +                result = [[(DOMHTMLElement *)documentElement innerText] stringByAppendingString:@"\n"];
           } else
               result = [frame renderTreeAsExternalRepresentation];
           
  
  
  
  1.25      +8 -5      WebKitTools/Scripts/run-webkit-tests
  
  Index: run-webkit-tests
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/run-webkit-tests,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- run-webkit-tests	11 Sep 2005 09:28:00 -0000	1.24
  +++ run-webkit-tests	15 Sep 2005 05:13:52 -0000	1.25
  @@ -514,7 +514,7 @@
       print HTML "</html>\n";
       close HTML;
       
  -    system "open", $testResults;
  +    system "WebKitTools/Scripts/run-safari", $testResults;
   }
   
   sub printLeaks
  @@ -524,12 +524,15 @@
       print "\n" unless $atLineStart;
       $atLineStart = 1;
   
  -    print " ? checking for leaks in $toolName\n";
  -    # we are excluding the following reported leaks so they don't get in our way of finding WebKit leaks:
  -    # pthread_create: false positive leak of 'THRD', Radar 3387783
  -    # _CFPreferencesDomainDeepCopyDictionary: leak apparently in CFPreferences, Radar 4220786
  +    # We are excluding the following reported leaks so they don't get in our way when looking for WebKit leaks:
  +    #
  +    #     pthread_create: false positive leak of 'THRD', Radar 3387783
  +    #     _CFPreferencesDomainDeepCopyDictionary: leak apparently in CFPreferences, Radar 4220786
  +    #
       # Note that this exclusion doesn't quite work right; sometimes a leak of 'THRD' with no stack trace will
       # still appear in the leaks output.
  +
  +    print " ? checking for leaks in $toolName\n";
       my $leaksOutput = `leaks -exclude pthread_create -exclude _CFPreferencesDomainDeepCopyDictionary $toolPID`;
       my ($count, $bytes) = $leaksOutput =~ /Process $toolPID: (\d+) leaks? for (\d+) total/;
       my ($excluded) = $leaksOutput =~ /(\d+) leaks? excluded/;