[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit a82425e80521952608c9c9922169d94843cb2d2a
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 13:01:04 2010 +0000

    2010-07-25  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
    
            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=42947
            Check for WEBKIT_TESTFONTS for qt, gtk and windows port and throw
            error. Without which dumpRenderTree crashes.
    
            * Scripts/old-run-webkit-tests:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 08ab61f..e9cb0d3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-25  Mahesh Kulkarni  <mahesh.kulkarni at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42947
+        Check for WEBKIT_TESTFONTS for qt, gtk and windows port and throw 
+        error. Without which dumpRenderTree crashes.
+
+        * Scripts/old-run-webkit-tests:
+
 2010-07-27  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index 88c0a05..af82545 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -214,12 +214,6 @@ if (isAppleMacWebKit()) {
     }
 } elsif (isGtk()) {
     $platform = "gtk";
-    if (!$ENV{"WEBKIT_TESTFONTS"}) {
-        print "The WEBKIT_TESTFONTS environment variable is not defined.\n";
-        print "You must set it before running the tests.\n";
-        print "Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts\n";
-        exit 1;
-    }
 } elsif (isWx()) {
     $platform = "wx";
 } elsif (isCygwin()) {
@@ -234,6 +228,16 @@ if (isAppleMacWebKit()) {
     }
 }
 
+if (isQt() || isGtk() || isCygwin()) {
+    my $testfontPath = $ENV{"WEBKIT_TESTFONTS"};
+    if (!$testfontPath || !-d "$testfontPath") {
+        print "The WEBKIT_TESTFONTS environment variable is not defined or not set properly\n";
+        print "You must set it before running the tests.\n";
+        print "Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts\n";
+        exit 1;
+    }
+}
+
 if (!defined($platform)) {
     print "WARNING: Your platform is not recognized. Any platform-specific results will be generated in platform/undefined.\n";
     $platform = "undefined";

-- 
WebKit Debian packaging