[Xfce4-commits] <midori:master> Use midori_paths_get_lib_path in extension test

[Christian Dywan]

Updating branch refs/heads/master
         to da38467692c307740c941bea7e974f69af04304f (commit)
       from d47994f8ace1bb1fa8d9d6b32e24ae156440a583 (commit)

commit da38467692c307740c941bea7e974f69af04304f
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Dec 12 01:48:01 2012 +0100

    Use midori_paths_get_lib_path in extension test

 tests/extensions.c  |    9 ++++++---
 tests/wscript_build |    1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/extensions.c b/tests/extensions.c
index 642f48f..33f1173 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -10,6 +10,7 @@
 */
 
 #include "midori.h"
+#include <glib/gstdio.h>
 
 const gpointer magic = (gpointer)0xdeadbeef;
 
@@ -213,12 +214,14 @@ main (int    argc,
 
     if (g_module_supported ())
     {
-        GDir* extension_dir = g_dir_open (EXTENSION_PATH, 0, NULL);
+        gchar* extension_path = midori_paths_get_lib_path (PACKAGE_NAME);
+        GDir* extension_dir = g_dir_open (extension_path, 0, NULL);
+        g_free (extension_path);
         g_assert (extension_dir != NULL);
 
         /* We require that extensions can be loaded repeatedly */
-        extension_load (EXTENSION_PATH, extension_dir);
-        extension_load (EXTENSION_PATH, extension_dir);
+        extension_load (extension_path, extension_dir);
+        extension_load (extension_path, extension_dir);
 
         g_dir_close (extension_dir);
     }
diff --git a/tests/wscript_build b/tests/wscript_build
index 2e79701..085ebb5 100644
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -41,7 +41,6 @@ for test in tests:
     obj = bld.new_task_gen ('cc', 'program')
     obj.target = 'test-' + target
     obj.includes = '.. ../midori ../panels'
-    obj.cflags = ['-DEXTENSION_PATH="' + os.path.abspath ('_build/default/extensions') + '"']
     obj.source = source
     if 'vala' in source:
         obj.env.append_value ('CCFLAGS', '-w')