run-api-tests: inline runAllTestsInSuite() into runAllTests()

Reviewed by Adam Roben.

Part of: <http://webkit.org/b/75065> run-api-tests should be able to run individual suites and tests

In order to make it easy to run one or more individual suites,
or one more individual tests, it's easier to call a single
method with different data structures than individual methods.

* Scripts/run-api-tests:
(runAllTests): Inline runAllTestsInSuite().

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 29bce7d7f43414bb46b4f98be48c1e2671915e41..a34efa88b5e1b45cd6d096690341433ae43f7d2c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-12-22  David Kilzer  <ddkilzer@apple.com>
+
+        run-api-tests: inline runAllTestsInSuite() into runAllTests()
+
+        Reviewed by Adam Roben.
+
+        Part of: <http://webkit.org/b/75065> run-api-tests should be able to run individual suites and tests
+
+        In order to make it easy to run one or more individual suites,
+        or one more individual tests, it's easier to call a single
+        method with different data structures than individual methods.
+
+        * Scripts/run-api-tests:
+        (runAllTests): Inline runAllTestsInSuite().
+
 2011-12-22  Adam Roben  <aroben@apple.com>
 
         Add a --xml flag to test-webkitpy

diff --git a/Tools/Scripts/run-api-tests b/Tools/Scripts/run-api-tests
index cfc4e6ab9ded1fc94c28519a0fc853bf0cedd902..1ee8dd580a365115010d4608120563df746d9840 100755 (executable)
--- a/Tools/Scripts/run-api-tests
+++ b/Tools/Scripts/run-api-tests
@@ -42,7 +42,6 @@ sub buildTestTool();
 sub dumpTestsBySuite(\%);
 sub populateTests();
 sub runAllTests();
-sub runAllTestsInSuite($);
 sub runTest($$);
 sub prepareEnvironmentForRunningTestTool();
 sub testToolPath();
@@ -118,9 +117,12 @@ sub runAllTests()
 {
     my $anyFailures = 0;
     for my $suite (sort keys %testsToRun) {
-        my $failed = runAllTestsInSuite($suite);
-        if ($failed) {
-            $anyFailures = 1;
+        print "Suite: $suite\n" unless $verbose;
+        for my $test (sort @{$testsToRun{$suite}}) {
+            my $failed = runTest($suite, $test);
+            if ($failed) {
+                $anyFailures = 1;
+            }
         }
     }
     
@@ -141,22 +143,6 @@ sub runAllTests()
     return $anyFailures;
 }
 
-sub runAllTestsInSuite($)
-{
-    my ($suite) = @_;
-    print "Suite: $suite\n" unless $verbose;
-
-    my $anyFailures = 0;
-    for my $test (sort @{$testsToRun{$suite}}) {
-        my $failed = runTest($suite, $test);
-        if ($failed) {
-            $anyFailures = 1;
-        }
-    }
-   
-    return $anyFailures;
-}
-
 sub runTest($$)
 {
     my ($suite, $testName) = @_;