From bc1c89639d860bd74a57f27aa1fba0ca6fd64b6e Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 13 Feb 2011 23:45:11 +0100
Subject: [PATCH] fix the plugin loading test to suit the new dir layout

the 'missing path' test still works, but rather
accidentally: the plugin search path retrieved from
resolving $ORIGIN is an absolute path, while this
test uses relative paths; thus the querried plugin
won't be found. In the second test, we set an
environment override, using the relative path
(which is now 'modules'). Thus the discovery works.
---
 data/config/setup.ini          |  2 +-
 tests/31plugin.tests           |  3 ++-
 tests/common/test-interfaces.c | 13 +++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/data/config/setup.ini b/data/config/setup.ini
index 9ea9af1a3..b9723bc0f 100644
--- a/data/config/setup.ini
+++ b/data/config/setup.ini
@@ -10,7 +10,7 @@
 #
 gui          = gtk_gui.lum
 modulepath   = $ORIGIN/modules
-configpath   = /usr/share/lumiera/config:~/.lumiera
+configpath   = $ORIGIN/../../share/lumiera/config:~/.lumiera
 title        = Lumiera
 version      = 0.pre.01
 website      = http://www.lumiera.org
diff --git a/tests/31plugin.tests b/tests/31plugin.tests
index e81b1c5a9..ace85086a 100644
--- a/tests/31plugin.tests
+++ b/tests/31plugin.tests
@@ -15,7 +15,8 @@ return: 0
 END
 
 TEST "plugin unloading" plugin_unload <<END
-out: plugin unload: \(nil\)
+out: plugin discovered before unload: 0x..
+out: plugin discovered after unload: \(nil\)
 return: 0
 END
 
diff --git a/tests/common/test-interfaces.c b/tests/common/test-interfaces.c
index 93440a530..19db8f8da 100644
--- a/tests/common/test-interfaces.c
+++ b/tests/common/test-interfaces.c
@@ -465,7 +465,7 @@ TEST (plugin_discover)
 
   if (lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register))
     {
-      LumieraPlugin p = lumiera_plugin_lookup (".libs/examplepluginc.lum");
+      LumieraPlugin p = lumiera_plugin_lookup ("modules/examplepluginc.lum");
       printf ("found plugin: %s\n", lumiera_plugin_name (p));
       lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register);
     }
@@ -482,9 +482,14 @@ TEST (plugin_unload)
   lumiera_interfaceregistry_init ();
 
   lumiera_plugin_discover (lumiera_plugin_load, lumiera_plugin_register);
-  lumiera_plugin_unload (lumiera_plugin_lookup (".libs/examplepluginc.so"));
-  LumieraPlugin p = lumiera_plugin_lookup (".libs/examplepluginc.so");
-  printf ("plugin unload: %p\n", p);
+  LumieraPlugin p = lumiera_plugin_lookup ("modules/examplepluginc.lum");
+  printf ("plugin discovered before unload: %p\n", p);
+  CHECK (p, "prerequisite: need to load examplepluginc.lum");
+
+  lumiera_plugin_unload (lumiera_plugin_lookup ("modules/examplepluginc.lum"));
+  p = lumiera_plugin_lookup ("examplepluginc.lum");
+  printf ("plugin discovered after unload: %p\n", p);
+  CHECK (!p, "failed to unload plugin.");
 
   lumiera_interfaceregistry_destroy ();
   lumiera_config_destroy ();