AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'reftest-fixes' into 'master'

Browse Source 
Reftest fixes

See merge request GNOME/gtk!1157
This commit is contained in:
Matthias Clasen 2019-11-01 17:45:38 +00:00
commit 5f627a2cb6
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testsuite/reftests/reftest-module.c
View File

@ -98,25 +98,8 @@ reftest_module_new (const char *directory,
module = g_module_open (full_path, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
if (module == NULL)
{
/* libtool hack */
char *libtool_dir = g_build_filename (directory, ".libs", NULL);
g_free (full_path);
full_path = g_module_build_path (libtool_dir, module_name);
result = reftest_module_find_existing (full_path);
if (result)
{
g_free (full_path);
return reftest_module_ref (result);
}
module = g_module_open (full_path, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
if (module == NULL)
{
g_free (full_path);
return NULL;
}
return NULL;
}
return reftest_module_new_take (module, full_path);

2
testsuite/reftests/reftest-snapshot.c
View File

@ -194,7 +194,7 @@ connect_signals (GtkBuilder *builder,
module = reftest_module_new (directory, split[0]);
if (module == NULL)
{
g_error ("Could not load module '%s' from '%s' when looking up '%s'", split[0], directory, handler_name);
g_error ("Could not load module '%s' from '%s' when looking up '%s': %s", split[0], directory, handler_name, g_module_error ());
return;
}
func = reftest_module_lookup (module, split[1]);