Fix the plugin testsuite, only registry.c doesn't work yet

Original commit message from CVS:
Fix the plugin testsuite, only registry.c doesn't work yet

7 files changed, 28 insertions, 28 deletions

diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am
index 5d7a21af78..5f8a0152d6 100644
--- a/testsuite/plugin/Makefile.am
+++ b/testsuite/plugin/Makefile.am
@@ -1,24 +1,26 @@
+plugindir = $(builddir)/testsuite/plugin/
+
 GST_PLUGIN_PATH=$(shell cd $(top_builddir) && pwd)
 TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(GST_PLUGIN_PATH) GST_REGISTRY=$(GST_PLUGIN_PATH)/testsuite/test-registry.xml
 
+plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la
+
 # FIXME : tests need fixing
-testprogs = # static dynamic linked loading registry static2
+testprogs = static dynamic linked loading registry static2
 
 AM_CFLAGS = $(GST_CFLAGS)
 LIBS = $(GST_LIBS)
 
-noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
-
 libtestplugin_la_SOURCES = testplugin.c
 libtestplugin_la_CFLAGS = $(GST_CFLAGS)
-libtestplugin_la_LIBS = $(GST_LIBS)
+libtestplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libtestplugin2_la_SOURCES = testplugin2.c
 libtestplugin2_la_CFLAGS = $(GST_CFLAGS)
-libtestplugin2_la_LIBS = $(GST_LIBS)
+libtestplugin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-# linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
+linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
 
-# static_SOURCES = static.c testplugin_s.c testplugin2_s.c
+static_SOURCES = static.c testplugin_s.c testplugin2_s.c
 
 TESTS = $(testprogs)
 
diff --git a/testsuite/plugin/dynamic.c b/testsuite/plugin/dynamic.c
index 1e3c4d3255..df633ac51b 100644
--- a/testsuite/plugin/dynamic.c
+++ b/testsuite/plugin/dynamic.c
@@ -9,14 +9,12 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  gst_plugin_add_path (".");
+  plugin = gst_plugin_new (".libs/libtestplugin.so");
+  g_assert (plugin != NULL);
 
-  loaded = gst_plugin_load ("testplugin");
+  loaded = gst_plugin_load_plugin (plugin);
   g_assert (loaded == TRUE);
 
-  plugin = gst_plugin_find ("testplugin");
-  g_assert (plugin != NULL);
-
   g_print ("testplugin: %d, %s\n", loaded, plugin->name);
 
   return 0;
diff --git a/testsuite/plugin/linked.c b/testsuite/plugin/linked.c
index 48215ee5bb..017431126e 100644
--- a/testsuite/plugin/linked.c
+++ b/testsuite/plugin/linked.c
@@ -8,12 +8,12 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  plugin = gst_plugin_find ("testplugin");
+  plugin = gst_registry_pool_find_plugin ("testplugin");
   g_assert (plugin != NULL);
 
   g_print ("testplugin: %p %s\n", plugin, plugin->name);
 
-  plugin = gst_plugin_find ("testplugin2");
+  plugin = gst_registry_pool_find_plugin ("testplugin2");
   g_assert (plugin != NULL);
 
   g_print ("testplugin2: %p %s\n", plugin, plugin->name);
diff --git a/testsuite/plugin/loading.c b/testsuite/plugin/loading.c
index 479630fe73..7b516f4b61 100644
--- a/testsuite/plugin/loading.c
+++ b/testsuite/plugin/loading.c
@@ -10,45 +10,45 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  numplugins = g_list_length (gst_plugin_get_list ());
+  numplugins = g_list_length (gst_registry_pool_plugin_list ());
   g_print ("%d plugins loaded\n", numplugins);
   g_mem_chunk_info ();
 
-  plugin = gst_plugin_find ("ossaudio");
+  plugin = gst_registry_pool_find_plugin ("ossaudio");
   g_assert (plugin != NULL);
 
   g_print ("%d features in plugin\n", g_list_length (gst_plugin_get_feature_list (plugin)));
 
 
-  g_print ("ossaudio: %p %d\n", plugin, gst_plugin_is_loaded (plugin));
+  g_print ("ossaudio: %p  loaded: %s\n", plugin, (gst_plugin_is_loaded (plugin) ? "true": "false"));
   
   loaded = gst_plugin_load_plugin (plugin);
   g_assert (loaded == TRUE);
 
-  numplugins = g_list_length (gst_plugin_get_list ());
+  numplugins = g_list_length (gst_registry_pool_plugin_list ());
   g_print ("%d plugins loaded\n", numplugins);
 
   g_mem_chunk_info ();
 
-  plugin = gst_plugin_find ("ossaudio");
+  plugin = gst_registry_pool_find_plugin ("ossaudio");
   g_assert (plugin != NULL);
-  g_print ("ossaudio: %p %d\n", plugin, gst_plugin_is_loaded (plugin));
+  g_print ("ossaudio: %p  loaded: %s\n", plugin, (gst_plugin_is_loaded (plugin) ? "true": "false"));
 
   g_print ("%d features in plugin\n", g_list_length (gst_plugin_get_feature_list (plugin)));
 
   loaded = gst_plugin_load_plugin (plugin);
   g_assert (loaded == TRUE);
 
-  numplugins = g_list_length (gst_plugin_get_list ());
+  numplugins = g_list_length (gst_registry_pool_plugin_list ());
   g_print ("%d plugins loaded\n", numplugins);
 
   g_print ("%d features in plugin\n", g_list_length (gst_plugin_get_feature_list (plugin)));
 
   g_mem_chunk_info ();
 
-  plugin = gst_plugin_find ("ossaudio");
+  plugin = gst_registry_pool_find_plugin ("ossaudio");
   g_assert (plugin != NULL);
-  g_print ("osssink: %p %d\n", plugin, gst_plugin_is_loaded (plugin));
+  g_print ("ossaudio: %p  loaded: %s\n", plugin, (gst_plugin_is_loaded (plugin) ? "true": "false"));
 
   return 0;
 }
diff --git a/testsuite/plugin/registry.c b/testsuite/plugin/registry.c
index e7ec555dc8..719a2520c6 100644
--- a/testsuite/plugin/registry.c
+++ b/testsuite/plugin/registry.c
@@ -8,7 +8,7 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  plugin = gst_plugin_find ("testplugin");
+  plugin = gst_registry_pool_find_plugin ("testplugin");
   g_assert (plugin != NULL);
 
   g_print ("testplugin: %s\n", plugin->name);
diff --git a/testsuite/plugin/static.c b/testsuite/plugin/static.c
index 6b7d5373a8..0edb2979c3 100644
--- a/testsuite/plugin/static.c
+++ b/testsuite/plugin/static.c
@@ -8,12 +8,12 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  plugin = gst_plugin_find ("testplugin");
+  plugin = gst_registry_pool_find_plugin ("testplugin");
   g_assert (plugin != NULL);
 
   g_print ("testplugin: %p %s\n", plugin, plugin->name);
 
-  plugin = gst_plugin_find ("testplugin2");
+  plugin = gst_registry_pool_find_plugin ("testplugin2");
   g_assert (plugin != NULL);
 
   g_print ("testplugin2: %p %s\n", plugin, plugin->name);
diff --git a/testsuite/plugin/static2.c b/testsuite/plugin/static2.c
index 4d16ab9864..ec9229ed2e 100644
--- a/testsuite/plugin/static2.c
+++ b/testsuite/plugin/static2.c
@@ -36,12 +36,12 @@ main (int argc, char *argv[])
 
   gst_init (&argc, &argv);
 
-  plugin = gst_plugin_find ("testplugin");
+  plugin = gst_registry_pool_find_plugin ("testplugin");
   g_assert (plugin != NULL);
 
   g_print ("testplugin: %p %s\n", plugin, plugin->name);
 
-  plugin = gst_plugin_find ("testplugin2");
+  plugin = gst_registry_pool_find_plugin ("testplugin2");
   g_assert (plugin != NULL);
 
   g_print ("testplugin2: %p %s\n", plugin, plugin->name);