[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 154ff8cb69e4a802bda299e792d0d551011d75f1
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 27 19:45:25 2009 +0000

    2009-09-27  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Darin Adler.
    
            run-webkit-tests: Do not strip the metrics when there is no expected result for a test.
            https://bugs.webkit.org/show_bug.cgi?id=29771
    
            * Scripts/run-webkit-tests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d1c915f..eb28c3f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
 2009-09-27  Jakub Wieczorek  <faw217 at gmail.com>
 
+        Reviewed by Darin Adler.
+
+        run-webkit-tests: Do not strip the metrics when there is no expected result for a test.
+        https://bugs.webkit.org/show_bug.cgi?id=29771
+
+        * Scripts/run-webkit-tests:
+
+2009-09-27  Jakub Wieczorek  <faw217 at gmail.com>
+
         Reviewed by Simon Hausmann.
 
         [Qt] Implement layoutTestController.waitForPolicyDelegate.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 679fed5..f69f771 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -644,7 +644,7 @@ for my $test (@tests) {
         close EXPECTED;
     }
 
-    if ($ignoreMetrics && !$isText) {
+    if ($ignoreMetrics && !$isText && defined $expected) {
         ($actual, $expected) = stripMetrics($actual, $expected);
     }
 

-- 
WebKit Debian packaging