Changeset 25023 in webkit

Timestamp:

Aug 12, 2007 4:31:41 AM (17 years ago)

Author:

aroben

Message:

Generate results for new tests in a more logical location

New platform-specific tests always have their results generated right
next to the test. New cross-platform tests will have their results
generated a) in the cross-platform directory, if they are text-only,
or b) in the least-specific platform directory, if they are render
tree dumps.

Reviewed by Lars.

• Scripts/run-webkit-tests:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-08-12  Adam Roben  <aroben@apple.com>
+
+        Generate results for new tests in a more logical location
+
+        New platform-specific tests always have their results generated right
+        next to the test. New cross-platform tests will have their results
+        generated a) in the cross-platform directory, if they are text-only,
+        or b) in the least-specific platform directory, if they are render
+        tree dumps.
+
+        Reviewed by Lars.
+
+        * Scripts/run-webkit-tests:
+
 2007-08-12  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -78 +78 @@
 sub stripExtension($);
 sub isTextOnlyTest($);
-sub expectedDirectoryForTest($);
+sub expectedDirectoryForTest($;$);
 sub printFailureMessageForTest($$);
 sub toURL($);
@@ -519 +519 @@
 
     my $expected;
-    my $expectedDir = expectedDirectoryForTest($base);
+    my $expectedDir = expectedDirectoryForTest($base, $isText);
     if (isQt() && $isText) {
         $expectedDir = $testDirectory;
@@ -1306 +1306 @@
 }
 
-sub expectedDirectoryForTest($)
-{
-    my ($base) = @_;
-
-    foreach my $level (@platformHierarchy) {
-        return $level if (-f "$level/$base-$expectedTag.txt");
-    }
-
-    return $expectedDirectory if (-f "$expectedDirectory/$base-$expectedTag.txt");
-
-    return $platformHierarchy[$#platformHierarchy];
+sub expectedDirectoryForTest($;$)
+{
+    my ($base, $isText) = @_;
+
+    my @directories = @platformHierarchy;
+    push(@directories, $expectedDirectory);
+
+    # If we already have expected results, just return their location.
+    foreach my $directory (@directories) {
+        return $directory if (-f "$directory/$base-$expectedTag.txt");
+    }
+
+    # For platform-specific tests, the results should go right next to the test itself.
+    # Note: The return value of this subroutine will be concatenated with $base
+    # to determine the location of the new results, so returning $expectedDirectory
+    # will put the results right next to the test.
+    return $expectedDirectory if $base =~ /^platform/;
+
+    # For cross-platform tests, text-only results should go in the cross-platform directory,
+    # while render tree dumps should go in the least-specific platform directory.
+    return $isText ? $expectedDirectory : $platformHierarchy[$#platformHierarchy];
 }