diff options
| author | Garrett Regier <garrett.regier@riftio.com> | 2014-11-08 12:24:09 -0800 |
|---|---|---|
| committer | Garrett Regier <garrett.regier@riftio.com> | 2014-11-18 10:30:39 -0800 |
| commit | 47ff5e97b4066822b773c04a063914fecafb20bf (patch) | |
| tree | 4fa8d83b9b36c17ff01bf8721773a56082f179a1 /tests | |
| parent | fbfea67c9ae08b570e5aa5bcd644d70937f50f20 (diff) | |
| download | libpeas-47ff5e97b4066822b773c04a063914fecafb20bf.tar.gz | |
Make PeasEngine thread-safe
https://bugzilla.gnome.org/show_bug.cgi?id=739619
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libpeas/extension-py.c | 3 | ||||
| -rw-r--r-- | tests/libpeas/testing/testing-extension.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/libpeas/extension-py.c b/tests/libpeas/extension-py.c index 6b6a472..b668558 100644 --- a/tests/libpeas/extension-py.c +++ b/tests/libpeas/extension-py.c @@ -207,8 +207,7 @@ test_extension_py_mixed_python_subprocess (void) testing_util_push_log_hook ("*'" ALT_PY_LOADER_STR "' is not a valid PeasPluginLoader*"); - /* Required when loading multiple loaders */ - g_setenv ("PEAS_ALLOW_ALL_LOADERS", "1", TRUE); + g_setenv ("PEAS_ALLOW_CONFLICTING_LOADERS", "1", TRUE); engine = testing_engine_new (); peas_engine_enable_loader (engine, ALT_PY_LOADER_STR); diff --git a/tests/libpeas/testing/testing-extension.c b/tests/libpeas/testing/testing-extension.c index e1f6a59..2fd5dda 100644 --- a/tests/libpeas/testing/testing-extension.c +++ b/tests/libpeas/testing/testing-extension.c @@ -46,6 +46,7 @@ struct _TestFixture { PeasPluginInfo *info; }; +static gchar *loader = NULL; static gchar *extension_plugin = NULL; static void @@ -53,6 +54,7 @@ test_setup (TestFixture *fixture, gconstpointer data) { fixture->engine = testing_engine_new (); + peas_engine_enable_loader (fixture->engine, loader); fixture->info = peas_engine_get_plugin_info (fixture->engine, extension_plugin); } @@ -386,13 +388,15 @@ test_extension_call_multi_args (PeasEngine *engine, } G_STMT_END void -testing_extension_basic (const gchar *loader) +testing_extension_basic (const gchar *loader_) { gint i, j; gchar *loader_name; PeasEngine *engine; - loader_name = g_new0 (gchar, strlen (loader)); + loader = g_strdup (loader_); + + loader_name = g_new0 (gchar, strlen (loader) + 1); for (i = 0, j = 0; loader[i] != '\0'; ++i) { if (loader[i] != '.') @@ -451,6 +455,7 @@ testing_extension_run_tests (void) retval = testing_run_tests (); g_free (extension_plugin); + g_free (loader); return retval; } |