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

meson: Add tls-interaction test, and fix giomodule test

Browse Source 
giomodule test needed symbol visibility pragmas added. This is needed on
Windows anyway, so it's better to do it this way rather than disabling
-fvisibility=hidden for the test modules.
This commit is contained in:
Nirbheek Chauhan 2016-12-21 07:46:30 +05:30 committed by Matthias Clasen
parent e2da3cb599
commit 122f4c051d
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/tests/meson.build
View File

@ -144,6 +144,12 @@ exe = executable('tls-certificate', 'tls-certificate.c', 'gtesttlsbackend.c',
) )
test('tls-certificate', exe, env : test_env) test('tls-certificate', exe, env : test_env)
exe = executable('tls-interaction', 'tls-interaction.c', 'gtesttlsbackend.c',
c_args : test_c_args,
dependencies : [libglib_dep, libgmodule_dep, libgio_dep],
)
test('tls-interaction', exe, env : test_env)
exe = executable('socket-client', 'socket-client.c', 'gtlsconsoleinteraction.c', exe = executable('socket-client', 'socket-client.c', 'gtlsconsoleinteraction.c',
c_args : test_c_args, c_args : test_c_args,
dependencies : [libglib_dep, libgmodule_dep, libgio_dep], dependencies : [libglib_dep, libgmodule_dep, libgio_dep],
@ -156,6 +162,8 @@ exe = executable('socket-client', 'socket-client.c', 'gtlsconsoleinteraction.c',
#) #)
#test('gdbus-daemon', exe, env : test_env) #test('gdbus-daemon', exe, env : test_env)
# FIXME: Add resources test
foo = ''' foo = '''
c_args_atomic = [ ] c_args_atomic = [ ]
if cc.get_id() == 'gcc' if cc.get_id() == 'gcc'

16
gio/tests/modules/symbol-visibility.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef GLIB_TEST_SYMBOL_VISIBILITY
#define GLIB_TEST_SYMBOL_VISIBILITY
/* This is the same check that's done in configure to create config.h */
#ifdef _WIN32
# ifdef _MSC_VER
# define GLIB_TEST_EXPORT_SYMBOL __declspec(dllexport) extern
# else
# define GLIB_TEST_EXPORT_SYMBOL __attribute__((visibility("default"))) __declspec(dllexport) extern
# endif
/* Matches GCC and Clang */
#elif defined(__GNUC__) && (__GNUC__ >= 4)
# define GLIB_TEST_EXPORT_SYMBOL __attribute__((visibility("default"))) extern
#endif
#endif /* GLIB_TEST_SYMBOL_VISIBILITY */

6
gio/tests/modules/test-module-a.c
View File

@ -22,6 +22,8 @@
#include <gio/gio.h> #include <gio/gio.h>
#include "symbol-visibility.h"
typedef struct _TestA { typedef struct _TestA {
GObject parent; GObject parent;
} TestA; } TestA;
@ -42,7 +44,7 @@ test_a_init (TestA *self)
{ {
} }
void GLIB_TEST_EXPORT_SYMBOL void
g_io_module_load (GIOModule *module) g_io_module_load (GIOModule *module)
{ {
g_io_extension_point_implement ("test-extension-point", g_io_extension_point_implement ("test-extension-point",
@ -51,7 +53,7 @@ g_io_module_load (GIOModule *module)
30); 30);
} }
void GLIB_TEST_EXPORT_SYMBOL void
g_io_module_unload (GIOModule *module) g_io_module_unload (GIOModule *module)
{ {
} }

6
gio/tests/modules/test-module-b.c
View File

@ -22,6 +22,8 @@
#include <gio/gio.h> #include <gio/gio.h>
#include "symbol-visibility.h"
typedef struct _TestB { typedef struct _TestB {
GObject parent; GObject parent;
} TestB; } TestB;
@ -42,7 +44,7 @@ test_b_init (TestB *self)
{ {
} }
void GLIB_TEST_EXPORT_SYMBOL void
g_io_module_load (GIOModule *module) g_io_module_load (GIOModule *module)
{ {
g_io_extension_point_implement ("test-extension-point", g_io_extension_point_implement ("test-extension-point",
@ -51,7 +53,7 @@ g_io_module_load (GIOModule *module)
40); 40);
} }
void GLIB_TEST_EXPORT_SYMBOL void
g_io_module_unload (GIOModule *module) g_io_module_unload (GIOModule *module)
{ {
} }