diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2013-05-29 23:49:30 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2013-05-31 23:03:19 -0400 |
| commit | e66abbe2ef574b1ff5c36588bbac7267f04e5abe (patch) | |
| tree | 347d3343293c994009c25df2a33fe221fb22dac0 /tests/module-test.c | |
| parent | d7b3e558cfc91b1eaee80b156ad358774ded1c34 (diff) | |
| download | glib-e66abbe2ef574b1ff5c36588bbac7267f04e5abe.tar.gz | |
Some final g_test_build_filename() porting
This should be the last users that need to be ported.
For some of the oldschool non-gtester-ified tests, we call g_test_init()
from main() because it is necessary in order to use
g_test_build_filename().
Diffstat (limited to 'tests/module-test.c')
| -rw-r--r-- | tests/module-test.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/module-test.c b/tests/module-test.c index 3e648a6da..f54a0153a 100644 --- a/tests/module-test.c +++ b/tests/module-test.c @@ -30,8 +30,6 @@ #include <gmodule.h> #include <string.h> -static const gchar *datapath; - gchar* global_state; G_MODULE_EXPORT void g_clash_func (void); @@ -75,24 +73,21 @@ test_states (const gchar *global, const gchar *gplugin_a, static SimpleFunc plugin_clash_func = NULL; int -main (int arg, - char *argv[]) +main (int argc, + char **argv) { GModule *module_self, *module_a, *module_b; gchar *plugin_a, *plugin_b; SimpleFunc f_a, f_b, f_self; GModuleFunc gmod_f; + g_test_init (&argc, &argv, NULL); + if (!g_module_supported ()) g_error ("dynamic modules not supported"); - if (g_getenv ("G_TEST_DATA")) - datapath = g_getenv ("G_TEST_DATA"); - else - datapath = "."; - - plugin_a = g_build_filename (datapath, "libmoduletestplugin_a", NULL); - plugin_b = g_build_filename (datapath, "libmoduletestplugin_b", NULL); + plugin_a = g_test_build_filename (G_TEST_BUILT, "libmoduletestplugin_a", NULL); + plugin_b = g_test_build_filename (G_TEST_BUILT, "libmoduletestplugin_b", NULL); /* module handles */ |