[webkit-changes] cvs commit: WebKitTools/Scripts build-drawtest cvs-unapply run-drawtest run-webkit-tests webkitdirs.pm build-dumpkcanvastree

[Eric]

eseidel     05/11/29 16:03:21

  Modified:    .        ChangeLog
               Scripts  build-drawtest cvs-unapply run-drawtest
                        run-webkit-tests webkitdirs.pm
  Removed:     Scripts  build-dumpkcanvastree
  Log:
  Bug #: 5873
  Submitted by: eseidel
  Reviewed by: darin
          Update scripts to run SVG tests automatically (w/o --svg) if
          WebCore is built with SVG support.
  
          * Scripts/build-drawtest: SVG support required
          * Scripts/build-dumpkcanvastree: Removed.
          * Scripts/run-drawtest: SVG support required to run
          * Scripts/run-webkit-tests: pass *.svg files if WebCore has support
          * Scripts/webkitdirs.pm: changed CheckWebCoreSVGSupport
  
  Revision  Changes    Path
  1.124     +13 -0     WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- ChangeLog	28 Nov 2005 22:16:15 -0000	1.123
  +++ ChangeLog	30 Nov 2005 00:03:20 -0000	1.124
  @@ -1,3 +1,16 @@
  +2005-11-29  Eric Seidel  <eseidel at apple.com>
  +
  +        Reviewed by darin.
  +
  +        Update scripts to run SVG tests automatically (w/o --svg) if
  +        WebCore is built with SVG support.
  +
  +        * Scripts/build-drawtest: SVG support required
  +        * Scripts/build-dumpkcanvastree: Removed.
  +        * Scripts/run-drawtest: SVG support required to run
  +        * Scripts/run-webkit-tests: pass *.svg files if WebCore has support
  +        * Scripts/webkitdirs.pm: changed CheckWebCoreSVGSupport
  +
   2005-11-28  Alexey Proskuryakov  <ap at nypop.com>
   
           Reviewed by Darin. Committed by Maciej.
  
  
  
  1.4       +1 -1      WebKitTools/Scripts/build-drawtest
  
  Index: build-drawtest
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/build-drawtest,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build-drawtest	23 Sep 2005 03:31:47 -0000	1.3
  +++ build-drawtest	30 Nov 2005 00:03:20 -0000	1.4
  @@ -41,7 +41,7 @@
   
   # Check to see that all the frameworks are built (w/ SVG support).
   checkFrameworks();
  -checkWebCoreSVGSupport();
  +checkWebCoreSVGSupport(true);
   
   # Build
   chdir "WebKitTools/DrawTest" or die;
  
  
  
  1.7       +1 -1      WebKitTools/Scripts/cvs-unapply
  
  Index: cvs-unapply
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/cvs-unapply,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cvs-unapply	10 Oct 2005 06:35:12 -0000	1.6
  +++ cvs-unapply	30 Nov 2005 00:03:20 -0000	1.7
  @@ -88,7 +88,7 @@
           my $prefix = $1;
           my $base = $3;
           if ($prefix) {
  -            chdir $prefix or die;
  +            chdir $prefix or die "Failed to chdir to $prefix";
           }
   
           if ($patch =~ /\n@@ .* \+0,0 @@/) {
  
  
  
  1.3       +1 -1      WebKitTools/Scripts/run-drawtest
  
  Index: run-drawtest
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/run-drawtest,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- run-drawtest	23 Sep 2005 03:31:47 -0000	1.2
  +++ run-drawtest	30 Nov 2005 00:03:20 -0000	1.3
  @@ -38,7 +38,7 @@
   
   # Check to see that all the frameworks are built (w/ SVG support).
   checkFrameworks();
  -checkWebCoreSVGSupport();
  +checkWebCoreSVGSupport(true);
   
   # Set up DYLD_FRAMEWORK_PATH to point to the product directory.
   print "Start DrawTest with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
  
  
  
  1.35      +4 -2      WebKitTools/Scripts/run-webkit-tests
  
  Index: run-webkit-tests
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/run-webkit-tests,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- run-webkit-tests	21 Nov 2005 09:36:51 -0000	1.34
  +++ run-webkit-tests	30 Nov 2005 00:03:21 -0000	1.35
  @@ -92,7 +92,7 @@
   die "can't find executable $imageDiffTool (looked in $productDir)\n" if $pixelTests && !-x $imageDiffTool;
   
   checkFrameworks();
  -checkWebCoreSVGSupport() if $testSVGs;
  +my $haveSVGSupport = checkWebCoreSVGSupport($testSVGs);
   
   my $layoutTestsName = "LayoutTests";
   if ($testSVGs) {
  @@ -108,7 +108,9 @@
   
   my $findArguments = "\\( -name resources \\! -prune \\) -or -name '*.html' -or -name '*.xml' -or -name '*.xhtml'";
   if ($testSVGs) {
  -    $findArguments = "\\( -name resources \\! -prune \\) -or -name '*.svg'";
  +    $findArguments = "\\( -name Resources \\! -prune \\) -or -name '*.svg' -or -name '*.xml'";
  +} elsif ($haveSVGSupport) {
  +	$findArguments .= " -or -name '*.svg'";
   }
   my $foundTestName = 0;
   for my $test (@ARGV) {
  
  
  
  1.19      +5 -1      WebKitTools/Scripts/webkitdirs.pm
  
  Index: webkitdirs.pm
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/webkitdirs.pm,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- webkitdirs.pm	21 Nov 2005 09:36:52 -0000	1.18
  +++ webkitdirs.pm	30 Nov 2005 00:03:21 -0000	1.19
  @@ -218,10 +218,14 @@
   
   sub checkWebCoreSVGSupport
   {
  +	my $required = shift;
       my $framework = "WebCore";
       my $path = builtDylibPathForName($framework);
       my $hasSVG = hasSVGSupport($path);
  -    die "$framework at \"$path\" does not include SVG Support, please run build-webkit --svg\n" unless $hasSVG;
  +    if ($required && !$hasSVG) {
  +    	die "$framework at \"$path\" does not include SVG Support, please run build-webkit --svg\n";
  +    }
  +    return $hasSVG;
   }
   
   sub checkRequiredSystemConfig