luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-30 05:43:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some final g_test_build_filename() porting

Browse Source 
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().
This commit is contained in:
Ryan Lortie
2013-05-29 23:49:30 -04:00
parent d7b3e558cf
commit e66abbe2ef
8 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/module-test.c
View File

@@ -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 */