luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move testgobject to tests/

Browse Source 
And fix it to actually check the right things.
This commit is contained in:
Matthias Clasen 2013-01-01 14:06:20 -05:00
parent f2e00a07f4
commit 86610b0594
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gobject/Makefile.am
View File

@ -214,16 +214,13 @@ libgobject_2_0_la_SOURCES = $(gobject_target_sources)
# #
bin_PROGRAMS = gobject-query glib-genmarshal bin_PROGRAMS = gobject-query glib-genmarshal
bin_SCRIPTS = glib-mkenums bin_SCRIPTS = glib-mkenums
noinst_PROGRAMS = testgobject
# source files # source files
gobject_query_SOURCES = gobject-query.c gobject_query_SOURCES = gobject-query.c
glib_genmarshal_SOURCES = glib-genmarshal.c glib_genmarshal_SOURCES = glib-genmarshal.c
testgobject_SOURCES = testgobject.c
# link programs against libgobject # link programs against libgobject
progs_LDADD = ./libgobject-2.0.la $(libglib) progs_LDADD = ./libgobject-2.0.la $(libglib)
glib_genmarshal_LDADD = $(libglib) glib_genmarshal_LDADD = $(libglib)
gobject_query_LDADD = $(progs_LDADD) gobject_query_LDADD = $(progs_LDADD)
testgobject_LDADD = $(progs_LDADD)
# #
# auxillary files # auxillary files

4
tests/Makefile.am
View File

@ -64,7 +64,8 @@ noinst_PROGRAMS = $(TEST_PROGS) \
unicode-collate \ unicode-collate \
$(timeloop) \ $(timeloop) \
assert-msg-test \ assert-msg-test \
datetime datetime \
testgobject
TEST_PROGS += testglib TEST_PROGS += testglib
testglib_SOURCES = testglib.c testglib_SOURCES = testglib.c
@ -81,6 +82,7 @@ timeloop_LDADD = $(libglib)
timeloop_closure_LDADD = $(libglib) $(libgobject) timeloop_closure_LDADD = $(libglib) $(libgobject)
endif endif
datetime_LDADD = $(libglib) datetime_LDADD = $(libglib)
testgobject_LDADD = $(libglib) $(libgobject)
test_programs = \ test_programs = \
atomic-test \ atomic-test \

4
gobject/testgobject.c → tests/testgobject.c
View File

@ -390,10 +390,10 @@ main (int argc,
/* test new fundamentals */ /* test new fundamentals */
g_assert (G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST) == g_type_fundamental_next ()); g_assert (G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST) == g_type_fundamental_next ());
type = g_type_register_fundamental (g_type_fundamental_next (), "FooShadow1", &info, &finfo, 0); type = g_type_register_fundamental (g_type_fundamental_next (), "FooShadow1", &info, &finfo, 0);
g_assert (type == G_TYPE_RESERVED_USER_FIRST); g_assert (type == G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST));
g_assert (G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 1) == g_type_fundamental_next ()); g_assert (G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 1) == g_type_fundamental_next ());
type = g_type_register_fundamental (g_type_fundamental_next (), "FooShadow2", &info, &finfo, 0); type = g_type_register_fundamental (g_type_fundamental_next (), "FooShadow2", &info, &finfo, 0);
g_assert (type == G_TYPE_RESERVED_USER_FIRST + 1); g_assert (type == G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 1));
g_assert (G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 2) == g_type_fundamental_next ()); g_assert (G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 2) == g_type_fundamental_next ());
g_assert (g_type_from_name ("FooShadow1") == G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST)); g_assert (g_type_from_name ("FooShadow1") == G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST));
g_assert (g_type_from_name ("FooShadow2") == G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 1)); g_assert (g_type_from_name ("FooShadow2") == G_TYPE_MAKE_FUNDAMENTAL (G_TYPE_RESERVED_USER_FIRST + 1));