[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

kov at webkit.org kov at webkit.org
Thu Apr 8 00:01:50 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit a9abbee5eb27d4eb13c7535c030682c4acc8a026
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 17:54:10 2009 +0000

    Reviewed by Simon Fraser.
    
    Check for WEBKIT_TESTFONTS environment variable in
    run-webkit-tests, for GTK+, to have a more prominent error
    message.
    
    * Scripts/run-webkit-tests:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51499 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bffc565..26d45ca 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-30  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Simon Fraser.
+
+        Check for WEBKIT_TESTFONTS environment variable in
+        run-webkit-tests, for GTK+, to have a more prominent error
+        message.
+
+        * Scripts/run-webkit-tests:
+
 2009-11-30  Yaar Schnitman  <yaar at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index c27156e..c0db332 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -191,6 +191,12 @@ 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()) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list