Changeset 104342 in webkit

Timestamp:

Jan 6, 2012 2:46:12 PM (12 years ago)

Author:

ddkilzer@apple.com

Message:

run-api-tests: change internal representation of tests to array of "SuiteName.TestName" strings

Reviewed by Adam Roben.

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

• Scripts/run-api-tests:

(dumpTestsBySuite): Update to accept array of tests instead of
hash data structure.
(runTestsBySuite): Ditto.
(listAllTests): Rename from populateTests(). Update to return
an array of tests instad of the hash data structure.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-api-tests (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-06  David Kilzer  <ddkilzer@apple.com>
+
+        run-api-tests: change internal representation of tests to array of "SuiteName.TestName" strings
+
+        Reviewed by Adam Roben.
+
+        Part of: <http://webkit.org/b/75065> run-api-tests should be able to run individual suites and tests
+
+        * Scripts/run-api-tests:
+        (dumpTestsBySuite): Update to accept array of tests instead of
+        hash data structure.
+        (runTestsBySuite): Ditto.
+        (listAllTests): Rename from populateTests().  Update to return
+        an array of tests instad of the hash data structure.
+
 2012-01-05  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/run-api-tests

@@ -1 +1 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
 
 sub buildTestTool();
-sub dumpTestsBySuite(\%);
-sub populateTests();
+sub dumpTestsBySuite(\@);
+sub listAllTests();
 sub runTest($$$);
-sub runTestsBySuite(\%$);
+sub runTestsBySuite(\@$);
 sub prepareEnvironmentForRunningTestTool();
 sub testToolPath();
@@ -86 +86 @@
 buildTestTool() if $build;
 setPathForRunningWebKitApp(\%ENV);
-my %testsToRun = populateTests();
+my @testsToRun = listAllTests();
 
 if ($dumpTests) {
-    dumpTestsBySuite(%testsToRun);
+    dumpTestsBySuite(@testsToRun);
     exit 0;
 }
 
-if (runTestsBySuite(%testsToRun, $verbose)) {
+if (runTestsBySuite(@testsToRun, $verbose)) {
     exit 1;
 }
@@ -102 +102 @@
 }
 
-sub dumpTestsBySuite(\%)
-{
-    my ($testsBySuite) = @_;
+sub dumpTestsBySuite(\@)
+{
+    my ($tests) = @_;
     print "Dumping test cases\n";
     print "------------------\n";
-    for my $suite (sort keys %$testsBySuite) {
-        print $suite . ":\n";
-        print map { "   " . $_ . "\n" } sort @{ $testsBySuite->{$suite} };
+    my $lastSuite = "";
+    for my $suiteAndTest (sort @$tests) {
+        my ($suite, $test) = split(/\./, $suiteAndTest);
+        if ($lastSuite ne $suite) {
+            $lastSuite = $suite;
+            print "$suite:\n";
+        }
+        print "   $test\n";
     }
     print "------------------\n";
 }
 
-sub runTestsBySuite(\%$)
+sub runTestsBySuite(\@$)
 {
     my ($tests, $verbose) = @_;
     my $anyFailures = 0;
-    for my $suite (sort keys %$tests) {
-        print "Suite: $suite\n" unless $verbose;
-        for my $test (sort @{$tests->{$suite}}) {
-            my $failed = runTest($suite, $test, $verbose);
-            if ($failed) {
-                $anyFailures = 1;
-            }
-        }
+    my $lastSuite = "";
+    for my $suiteAndTest (sort @$tests) {
+        my ($suite, $test) = split(/\./, $suiteAndTest);
+        if ($lastSuite ne $suite) {
+            $lastSuite = $suite;
+            print "Suite: $suite\n" unless $verbose;
+        }
+        my $failed = runTest($suite, $test, $verbose);
+        $anyFailures ||= $failed;
     }
     
@@ -213 +219 @@
 }
 
-sub populateTests()
-{
-    my @tests;
+sub listAllTests()
+{
+    my @toolOutput;
     my $timedOut;
 
@@ -239 +245 @@
 
     close($childIn);
-    @tests = <$childOut>;
+    @toolOutput = <$childOut>;
     close($childOut);
     close($childErr);
@@ -252 +258 @@
     }
 
-    my %keyedTests = ();
+    my @tests = ();
     my $suite;
-    for my $test (@tests) {
-       $test =~ s/[\r\n]*$//;
-       if ($test =~ m/\.$/) {
-          $test =~ s/\.$//;
-          $suite = $test;
+    for my $line (@toolOutput) {
+       $line =~ s/[\r\n]*$//;
+       if ($line =~ m/\.$/) {
+          $suite = $line; # "SuiteName."
        } else {
-          $test =~ s/^\s*//;
-          push @{$keyedTests{$suite}}, $test;
-        }
-    }
- 
-    return %keyedTests;
-}
-
+          $line =~ s/^\s*//; # "TestName"
+          push @tests, $suite . $line; # "SuiteName.TestName"
+        }
+    }
+
+    return @tests;
+}
 
 sub buildTestTool()