* Check to see if the directory exists and exit if not.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e8754bb3d3146f8d49838bd47fcbd0b652b97d5b..02c565fb4a0dd1e7fd7cc81d745d56e524fc0aac 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-01  Adam Treat  <treat@kde.org>
+
+        Reviewed by Simon.
+
+        * Check to see if the directory exists and exit if not.
+
+        * DumpRenderTree/qt/main.cpp:
+        (main):
+
 2007-12-01  Adam Treat  <treat@kde.org>
 
         Reviewed by Simon.

diff --git a/WebKitTools/DumpRenderTree/qt/main.cpp b/WebKitTools/DumpRenderTree/qt/main.cpp
index e48cd073f7ff6893c83df93118e07239c37de126..d60b4a91ccffe1c36871fe99af8f86b4cd1b5166 100644 (file)
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -99,11 +99,11 @@ int main(int argc, char* argv[])
     FcInit();
     FcConfig *config = FcConfigCreate();
     QByteArray fontDir = getenv("WEBKIT_TESTFONTS");
-    if (fontDir.isEmpty()) {
+    if (fontDir.isEmpty() || !QDir(fontDir).exists()) {
         fprintf(stderr,
                 "\n\n"
                 "--------------------------------------------------------------------\n"
-                "WEBKIT_TESTFONTS environment variable is not set.\n"
+                "WEBKIT_TESTFONTS environment variable is not set correctly.\n"
                 "This variable has to point to the directory containing the fonts\n"
                 "you can checkout from svn://labs.trolltech.com/svn/webkit/testfonts\n"
                 "--------------------------------------------------------------------\n"