[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit fecfd30fbae93f1769b4cef84a5fc7cc67b1210d
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 19:23:19 2009 +0000

    2009-12-17  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            More make distcheck fixes. Use a more robust solution to making
            sure we are in the correct directory for running these tests.
    
            * tests/testmimehandling.c:
            (main):
            * tests/testwebview.c:
            (main):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index bfbf2c8..e464ee7 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-17  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        More make distcheck fixes. Use a more robust solution to making
+        sure we are in the correct directory for running these tests.
+
+        * tests/testmimehandling.c:
+        (main):
+        * tests/testwebview.c:
+        (main):
+
 2009-12-17  Christian Dywan  <christian at twotoasts.de>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/tests/testmimehandling.c b/WebKit/gtk/tests/testmimehandling.c
index 5887348..bfe3148 100644
--- a/WebKit/gtk/tests/testmimehandling.c
+++ b/WebKit/gtk/tests/testmimehandling.c
@@ -23,6 +23,7 @@
 #include <libsoup/soup.h>
 #include <string.h>
 #include <webkit/webkit.h>
+#include <unistd.h>
 
 #if GLIB_CHECK_VERSION(2, 16, 0) && GTK_CHECK_VERSION(2, 14, 0)
 
@@ -176,22 +177,20 @@ int main(int argc, char** argv)
 {
     SoupServer* server;
     SoupURI* soup_uri;
-    char* test_dir;
-    char* resources_dir;
 
     g_thread_init(NULL);
     gtk_test_init(&argc, &argv, NULL);
 
     /* Hopefully make test independent of the path it's called from. */
-    test_dir = g_path_get_dirname(argv[0]);
-    resources_dir = g_build_path(G_DIR_SEPARATOR_S, test_dir,
-                                 "..", "..", "..", "..",
-                                 "WebKit", "gtk", "tests", "resources",
-                                 NULL);
-    g_free(test_dir);
-
-    g_chdir(resources_dir);
-    g_free(resources_dir);
+    while (!g_file_test ("WebKit/gtk/tests/resources/test.html", G_FILE_TEST_EXISTS)) {
+        char path_name[PATH_MAX];
+
+        g_chdir("..");
+
+        g_assert(!g_str_equal(getcwd(path_name, PATH_MAX), "/"));
+    }
+
+    g_chdir("WebKit/gtk/tests/resources/");
 
     server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
     soup_server_run_async(server);
diff --git a/WebKit/gtk/tests/testwebview.c b/WebKit/gtk/tests/testwebview.c
index 6a1c5ec..7482747 100644
--- a/WebKit/gtk/tests/testwebview.c
+++ b/WebKit/gtk/tests/testwebview.c
@@ -125,22 +125,20 @@ int main(int argc, char** argv)
 {
     SoupServer* server;
     SoupURI* soup_uri;
-    char* test_dir;
-    char* resources_dir;
 
     g_thread_init(NULL);
     gtk_test_init(&argc, &argv, NULL);
 
     /* Hopefully make test independent of the path it's called from. */
-    test_dir = g_path_get_dirname(argv[0]);
-    resources_dir = g_build_path(G_DIR_SEPARATOR_S, test_dir,
-                                 "..", "..", "..", "..",
-                                 "WebKit", "gtk", "tests", "resources",
-                                 NULL);
-    g_free(test_dir);
-
-    g_chdir(resources_dir);
-    g_free(resources_dir);
+    while (!g_file_test ("WebKit/gtk/tests/resources/test.html", G_FILE_TEST_EXISTS)) {
+        char path_name[PATH_MAX];
+
+        g_chdir("..");
+
+        g_assert(!g_str_equal(getcwd(path_name, PATH_MAX), "/"));
+    }
+
+    g_chdir("WebKit/gtk/tests/resources/");
 
     server = soup_server_new(SOUP_SERVER_PORT, 0, NULL);
     soup_server_run_async(server);

-- 
WebKit Debian packaging