Merge branch 'reftest-fixes' into 'master'

Reftest fixes

See merge request GNOME/gtk!1157

2 files changed, 2 insertions, 19 deletions

diff --git a/testsuite/reftests/reftest-module.c b/testsuite/reftests/reftest-module.c
index 78fd1833aa..acab359522 100644
--- a/testsuite/reftests/reftest-module.c
+++ b/testsuite/reftests/reftest-module.c
@@ -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);
diff --git a/testsuite/reftests/reftest-snapshot.c b/testsuite/reftests/reftest-snapshot.c
index 231ff722e2..04e6c23fbd 100644
--- a/testsuite/reftests/reftest-snapshot.c
+++ b/testsuite/reftests/reftest-snapshot.c
@@ -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]);