mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-04 16:33:40 +02:00
Fix test failures for static builds
The plugin modules in these tests get statically linked with a separate copy of GLib so they end up calling vfuncs in their own copy of GLib. Fixes #1648
This commit is contained in:
committed by
Philip Withnall
parent
618d3e4a0a
commit
2718245dc2
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <gio/gio.h>
|
||||
#include <glibconfig.h>
|
||||
#include "gconstructor.h"
|
||||
#include "test_resources2.h"
|
||||
#include "digit_test_resources.h"
|
||||
@@ -644,6 +645,13 @@ test_resource_module (void)
|
||||
GBytes *data;
|
||||
GError *error;
|
||||
|
||||
#ifdef GLIB_STATIC_COMPILATION
|
||||
/* The resource module is statically linked with a separate copy
|
||||
* of a GLib so g_static_resource_init won't work as expected. */
|
||||
g_test_skip ("Resource modules aren't supported in static builds.");
|
||||
return;
|
||||
#endif
|
||||
|
||||
if (g_module_supported ())
|
||||
{
|
||||
module = g_io_module_new (g_test_get_filename (G_TEST_BUILT,
|
||||
|
Reference in New Issue
Block a user