From 9b1bf88d7df91983ea9edceda6b993e5713fc2e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 3 Jul 2010 14:04:32 +0100 Subject: [PATCH] checks: don't assume element factory is not loaded yet It may already be loaded if check is being run with CK_FORK=no. See #623469. --- tests/check/gst/gstelement.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/check/gst/gstelement.c b/tests/check/gst/gstelement.c index 3ec98e6..9544b6d 100644 --- a/tests/check/gst/gstelement.c +++ b/tests/check/gst/gstelement.c @@ -175,10 +175,13 @@ GST_START_TEST (test_class) factory = gst_element_factory_find ("queue"); fail_if (factory == NULL); - GST_DEBUG ("getting the type"); - /* feature is not loaded, should return 0 as the type */ - type = gst_element_factory_get_element_type (factory); - fail_if (type != 0); + /* it may already be loaded if check is being run with CK_FORK=no */ + if (!GST_PLUGIN_FEATURE (factory)->loaded) { + GST_DEBUG ("getting the type"); + /* feature is not loaded, should return 0 as the type */ + type = gst_element_factory_get_element_type (factory); + fail_if (type != 0); + } GST_DEBUG ("now loading the plugin"); tmp = -- 2.7.4