From 70021ef780f3672d5af470a7c19a1b841e002da6 Mon Sep 17 00:00:00 2001 From: eseidel Date: Fri, 30 Sep 2005 21:44:42 +0000 Subject: [PATCH] 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 --- WebKitTools/ChangeLog | 13 +++++++++++++ WebKitTools/Scripts/check-dom-results | 3 +-- WebKitTools/Scripts/prepare-ChangeLog | 5 ++++- WebKitTools/Scripts/run-webkit-tests | 7 +++---- WebKitTools/Scripts/update-webkit | 7 +++++-- WebKitTools/checkout | 6 +++++- 6 files changed, 31 insertions(+), 10 deletions(-) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index 299dc0031cc6..41e9ba0c234a 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,16 @@ +2005-09-30 Eric Seidel + + 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 - 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 2fb46c703e43..ab55287db1ca 100755 --- 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 6d878ddd2fb6..974f65f9bb4f 100755 --- 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 2de3b81ffed0..eeed0e545019 100755 --- 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 32d64a675da1..d608aadd6568 100755 --- 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 963a16f4eb59..b306a3c152c9 100755 --- 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 () { -- 2.36.0