Bug #: none

Submitted by: eseidel
Reviewed by: xenon
        Updated all the scripts for the move:
        WebCore/layout-tests -> LayoutTests

        * Scripts/check-dom-results:
        * Scripts/prepare-ChangeLog:
        * Scripts/run-webkit-tests:
        * Scripts/update-webkit: added --no-tests
        * checkout: added --no-tests

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 299dc0031cc6254dcb551f5c4d5c8f2a93062366..41e9ba0c234a7077d691b662085057c7bb05f9c2 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2005-09-30  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by xenon.
+
+        Updated all the scripts for the move:
+        WebCore/layout-tests -> LayoutTests
+
+        * Scripts/check-dom-results:
+        * Scripts/prepare-ChangeLog: 
+        * Scripts/run-webkit-tests:
+        * Scripts/update-webkit: added --no-tests
+        * checkout: added --no-tests
+
 2005-09-28  Darin Adler  <darin@apple.com>
 
         - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5144

diff --git a/WebKitTools/Scripts/check-dom-results b/WebKitTools/Scripts/check-dom-results
index 2fb46c703e438623767b82cd0bab8702b8855c6b..ab55287db1ca7e8178eb6625323d80ce03aa9263 100755 (executable)
--- a/WebKitTools/Scripts/check-dom-results
+++ b/WebKitTools/Scripts/check-dom-results
@@ -39,8 +39,7 @@ chdirWebKit();
 my $verbose = $ARGV[0] && $ARGV[0] eq "-v";
 
 my $workingDir = getcwd();
-my $WebCoreDirectory = "$workingDir/WebCore";
-my $testDirectory = "$WebCoreDirectory/layout-tests";
+my $testDirectory = "$workingDir/LayoutTests";
 
 my @suites = ( {"name" => "DOM Level 1 Core   (html)", "directory" => "dom/html/level1/core"},
                {"name" => "DOM Level 2 Core   (html)", "directory" => "dom/html/level2/core"},

diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 6d878ddd2fb68b0d7c67c211bdca9b75a1b9b8a0..974f65f9bb4f493781f5a204fe64987a6ff8ac0a 100755 (executable)
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -252,7 +252,10 @@ foreach my $prefix (sort keys %files)
     print CHANGE_LOG "$date  $name  <$email_address>\n\n";
     print CHANGE_LOG "        Reviewed by NOBODY (OOPS!).\n\n";
     if ($prefix =~ m/WebCore/ || `pwd` =~ m/WebCore/) {
-        print CHANGE_LOG "        Test cases added: (NONE)\n\n";
+        my $testsDir = "../LayoutTests";
+        $testsDir = "$prefix/$testsDir" if length($prefix);
+        my $haveNewTests = (system("find \"$testsDir/../LayoutTests\" -path \"*/CVS/Entries\" | xargs grep -q \"/0/dummy timestamp//\"") == 0);
+        print CHANGE_LOG "        WARNING: NO TEST CASES ADDED\n\n" unless $haveNewTests;
     }
 
     foreach my $file (sort @{$files{$prefix}})

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 2de3b81ffed089d2dad738899e4faf6989acb992..eeed0e5450195766a3cb1b0cae255d9e8b36a8d6 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -94,14 +94,13 @@ die "can't find executable $imageDiffTool (looked in $productDir)\n" if $pixelTe
 checkFrameworks();
 checkWebCoreSVGSupport() if $testSVGs;
 
-my $layoutTestsName = "layout-tests";
+my $layoutTestsName = "LayoutTests";
 if ($testSVGs) {
-    $layoutTestsName = "svg-tests";
+    $layoutTestsName = "SVGSupport/layout-tests";
 }
 
 my $workingDir = getcwd();
-my $WebCoreDirectory = "$workingDir/WebCore";
-my $testDirectory = "$WebCoreDirectory/$layoutTestsName";
+my $testDirectory = "$workingDir/$layoutTestsName";
 my $testResultsDirectory = "/tmp/layout-test-results";
 my $testResults = "$testResultsDirectory/results.html";
 

diff --git a/WebKitTools/Scripts/update-webkit b/WebKitTools/Scripts/update-webkit
index 32d64a675da1f7ad0c3c857f1371c30b30a365c9..d608aadd65687ffe84a24e79ed6dd039adfee636 100755 (executable)
--- a/WebKitTools/Scripts/update-webkit
+++ b/WebKitTools/Scripts/update-webkit
@@ -36,8 +36,10 @@ use webkitdirs;
 
 # Handle options
 my $quiet ='';
-my $cvsoptions= '';
-GetOptions('quiet|q' => \$quiet); 
+my $cvsoptions = '';
+my $includeTests = 1;
+GetOptions('quiet|q' => \$quiet,
+           'tests!' => \$includeTests); 
 $cvsoptions = '-q' if $quiet;
 
 chdirWebKit();
@@ -49,6 +51,7 @@ chomp $root;
 close ROOT;
 
 my @sources = ("WebKitTools", "JavaScriptCore", "WebCore", "WebKitLibraries", "WebKit");
+push @sources, "LayoutTests" if $includeTests;
 push @sources, "SVGSupport" if -d "SVGSupport";
 
 # Check out all the sources.

diff --git a/WebKitTools/checkout b/WebKitTools/checkout
index 963a16f4eb59295df61c6d5cb9d8db3e2c750144..b306a3c152c91a68e7c0b173bf5d3fb8c1829503 100755 (executable)
--- a/WebKitTools/checkout
+++ b/WebKitTools/checkout
@@ -32,7 +32,9 @@ use strict;
 use Getopt::Long;
 
 my $includeSVG = 0;
-GetOptions('svg' => \$includeSVG);
+my $includeTests = 1;
+GetOptions('svg' => \$includeSVG,
+           'tests!' => \$includeTests);
 
 # Check that we're in the right directory.
 if (! -d "WebKitTools") {
@@ -53,12 +55,14 @@ close ROOT;
 # Check out all the sources.
 print "CVS root is $root\n";
 print "Checking out WebKitTools (again), JavaScriptCore, WebCore, WebKitLibraries";
+print ", LayoutTests" if $includeTests;
 if ($includeSVG) {
     print ", WebKit and SVGSupport\n";
 } else {
     print " and WebKit\n";
 }
 my $directories = "WebKitTools JavaScriptCore WebCore WebKitLibraries WebKit";
+$directories .= " LayoutTests" if $includeTests;
 $directories .= " SVGSupport" if $includeSVG;
 open CVS, "cvs -d '$root' co -P $directories |" or die;
 while (<CVS>) {