diff options
| -rw-r--r-- | gobject/tests/meson.build | 2 | ||||
| -rw-r--r-- | gobject/tests/performance/meson.build | 13 | ||||
| -rw-r--r-- | gobject/tests/performance/performance-threaded.c (renamed from tests/gobject/performance-threaded.c) | 2 | ||||
| -rw-r--r-- | gobject/tests/performance/performance.c (renamed from tests/gobject/performance.c) | 2 | ||||
| -rw-r--r-- | tests/gobject/meson.build | 13 | ||||
| -rw-r--r-- | tests/gobject/testcommon.h | 105 |
6 files changed, 18 insertions, 119 deletions
diff --git a/gobject/tests/meson.build b/gobject/tests/meson.build index 98f992eff..1837fcc77 100644 --- a/gobject/tests/meson.build +++ b/gobject/tests/meson.build @@ -1,3 +1,5 @@ +subdir('performance') + marshalers_h = custom_target('marshalers_h', output : 'marshalers.h', input : 'marshalers.list', diff --git a/gobject/tests/performance/meson.build b/gobject/tests/performance/meson.build new file mode 100644 index 000000000..064e8cb3d --- /dev/null +++ b/gobject/tests/performance/meson.build @@ -0,0 +1,13 @@ +common_c_args = test_cargs + ['-DGLIB_DISABLE_DEPRECATION_WARNINGS'] +common_deps = [libm, thread_dep, libglib_dep, libgobject_dep] + +# Don't install these ones, and keep them out of 'meson test' because they take too long... +executable('performance', 'performance.c', + c_args : common_c_args, + dependencies : common_deps, + install : false) + +executable('performance-threaded', 'performance-threaded.c', + c_args : common_c_args, + dependencies : common_deps, + install : false)
\ No newline at end of file diff --git a/tests/gobject/performance-threaded.c b/gobject/tests/performance/performance-threaded.c index af8cc79b0..12a8b3d1e 100644 --- a/tests/gobject/performance-threaded.c +++ b/gobject/tests/performance/performance-threaded.c @@ -18,7 +18,7 @@ #include <math.h> #include <string.h> #include <glib-object.h> -#include "testcommon.h" +#include "../testcommon.h" #define DEFAULT_TEST_TIME 2 /* seconds */ diff --git a/tests/gobject/performance.c b/gobject/tests/performance/performance.c index 49885e852..937509d8d 100644 --- a/tests/gobject/performance.c +++ b/gobject/tests/performance/performance.c @@ -18,7 +18,7 @@ #include <math.h> #include <string.h> #include <glib-object.h> -#include "testcommon.h" +#include "../testcommon.h" #define WARM_UP_N_RUNS 50 #define ESTIMATE_ROUND_TIME_N_RUNS 5 diff --git a/tests/gobject/meson.build b/tests/gobject/meson.build index 6d6c1caaa..13923cdf3 100644 --- a/tests/gobject/meson.build +++ b/tests/gobject/meson.build @@ -41,15 +41,4 @@ foreach test_name, extra_args : gobject_tests timeout = suite.contains('slow') ? test_timeout_slow : test_timeout # FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset test(test_name, exe, env : test_env, timeout : timeout, suite : suite) -endforeach - -# Don't install these ones, and keep them out of 'make check' because they take too long... -executable('performance', 'performance.c', - c_args : common_c_args, - dependencies : common_deps, - install : false) - -executable('performance-threaded', 'performance-threaded.c', - c_args : common_c_args, - dependencies : common_deps, - install : false) +endforeach
\ No newline at end of file diff --git a/tests/gobject/testcommon.h b/tests/gobject/testcommon.h deleted file mode 100644 index 3e40cca67..000000000 --- a/tests/gobject/testcommon.h +++ /dev/null @@ -1,105 +0,0 @@ -/* GObject - GLib Type, Object, Parameter and Signal Library - * Copyright (C) 2003 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef __TEST_COMMON_H__ -#define __TEST_COMMON_H__ - -G_BEGIN_DECLS - -#define DEFINE_TYPE_FULL(name, prefix, \ - class_init, base_init, instance_init, \ - parent_type, interface_decl) \ -GType \ -prefix ## _get_type (void) \ -{ \ - static GType object_type = 0; \ - \ - if (!object_type) \ - { \ - const GTypeInfo object_info = \ - { \ - sizeof (name ## Class), \ - (GBaseInitFunc) base_init, \ - (GBaseFinalizeFunc) NULL, \ - (GClassInitFunc) class_init, \ - (GClassFinalizeFunc) NULL, \ - NULL, /* class_data */ \ - sizeof (name), \ - 0, /* n_prelocs */ \ - (GInstanceInitFunc) instance_init, \ - (const GTypeValueTable *) NULL, \ - }; \ - \ - object_type = g_type_register_static (parent_type, \ - # name, \ - &object_info, 0); \ - interface_decl \ - } \ - \ - return object_type; \ -} - -#define DEFINE_TYPE(name, prefix, \ - class_init, base_init, instance_init, \ - parent_type) \ - DEFINE_TYPE_FULL(name, prefix, class_init, base_init, \ - instance_init, parent_type, {}) - -#define DEFINE_IFACE(name, prefix, base_init, dflt_init) \ -GType \ -prefix ## _get_type (void) \ -{ \ - static GType iface_type = 0; \ - \ - if (!iface_type) \ - { \ - const GTypeInfo iface_info = \ - { \ - sizeof (name ## Class), \ - (GBaseInitFunc) base_init, \ - (GBaseFinalizeFunc) NULL, \ - (GClassInitFunc) dflt_init, \ - (GClassFinalizeFunc) NULL, \ - (gconstpointer) NULL, \ - (guint16) 0, \ - (guint16) 0, \ - (GInstanceInitFunc) NULL, \ - (const GTypeValueTable*) NULL, \ - }; \ - \ - iface_type = g_type_register_static (G_TYPE_INTERFACE, \ - # name, \ - &iface_info, 0); \ - } \ - return iface_type; \ -} - -#define INTERFACE_FULL(type, init_func, iface_type) \ -{ \ - GInterfaceInfo const iface = \ - { \ - (GInterfaceInitFunc) init_func, NULL, NULL \ - }; \ - \ - g_type_add_interface_static (type, iface_type, &iface); \ -} -#define INTERFACE(init_func, iface_type) \ - INTERFACE_FULL(object_type, init_func, iface_type) - -G_END_DECLS - -#endif /* __TEST_COMMON_H__ */ |