Merge branch 'nirbheek/remove-outdated-libtool-stuff' into 'master'

gio/tests: Remove code and comments referring to libtool

See merge request GNOME/glib!987
This commit is contained in:
Emmanuele Bassi 2019-07-13 11:13:56 +00:00
commit d56bdeb926
2 changed files with 0 additions and 4 deletions

View File

@ -89,7 +89,6 @@ test_module_scan_all (void)
GList *list; GList *list;
ep = g_io_extension_point_register ("test-extension-point"); ep = g_io_extension_point_register ("test-extension-point");
g_io_modules_scan_all_in_directory (g_test_get_filename (G_TEST_BUILT, "modules", NULL)); g_io_modules_scan_all_in_directory (g_test_get_filename (G_TEST_BUILT, "modules", NULL));
g_io_modules_scan_all_in_directory (g_test_get_filename (G_TEST_BUILT, "modules/.libs", NULL));
list = g_io_extension_point_get_extensions (ep); list = g_io_extension_point_get_extensions (ep);
g_assert_cmpint (g_list_length (list), ==, 2); g_assert_cmpint (g_list_length (list), ==, 2);
ext = list->data; ext = list->data;
@ -117,8 +116,6 @@ test_module_scan_all_with_scope (void)
g_io_module_scope_block (scope, MODULE_FILENAME_PREFIX "testmoduleb." G_MODULE_SUFFIX); g_io_module_scope_block (scope, MODULE_FILENAME_PREFIX "testmoduleb." G_MODULE_SUFFIX);
g_io_modules_scan_all_in_directory_with_scope (g_test_get_filename (G_TEST_BUILT, "modules", NULL), scope); g_io_modules_scan_all_in_directory_with_scope (g_test_get_filename (G_TEST_BUILT, "modules", NULL), scope);
list = g_io_extension_point_get_extensions (ep); list = g_io_extension_point_get_extensions (ep);
g_io_modules_scan_all_in_directory_with_scope (g_test_get_filename (G_TEST_BUILT, "modules/.libs", NULL), scope);
list = g_io_extension_point_get_extensions (ep);
g_assert_cmpint (g_list_length (list), ==, 1); g_assert_cmpint (g_list_length (list), ==, 1);
ext = list->data; ext = list->data;
g_assert_cmpstr (g_io_extension_get_name (ext), ==, "test-a"); g_assert_cmpstr (g_io_extension_get_name (ext), ==, "test-a");

View File

@ -646,7 +646,6 @@ test_resource_module (void)
if (g_module_supported ()) if (g_module_supported ())
{ {
/* For in-tree, this will find the .la file and use it to get to the .so in .libs/ */
module = g_io_module_new (g_test_get_filename (G_TEST_BUILT, module = g_io_module_new (g_test_get_filename (G_TEST_BUILT,
MODULE_FILENAME_PREFIX "resourceplugin", MODULE_FILENAME_PREFIX "resourceplugin",
NULL)); NULL));