luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix a few recently-broken tests

Browse Source
This commit is contained in:
Dan Winship 2013-05-21 11:21:36 -03:00
parent bb1a5ca9a8
commit 52f6a7d162
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/gobject/Makefile.am
View File

@ -70,6 +70,7 @@ performance_programs = \
performance_LDADD = $(libgobject) $(libgthread) performance_LDADD = $(libgobject) $(libgthread)
performance_threaded_LDADD = $(libgobject) $(libgthread) performance_threaded_LDADD = $(libgobject) $(libgthread)
check_PROGRAMS = $(test_programs) check_PROGRAMS = $(test_programs)
noinst_PROGRAMS = $(performance_programs)
TESTS = $(test_programs) $(performance_programs) TESTS = $(test_programs) $(performance_programs)
TESTS_ENVIRONMENT = srcdir=$(srcdir) \ TESTS_ENVIRONMENT = srcdir=$(srcdir) \

3
tests/module-test.c
View File

@ -79,7 +79,6 @@ main (int arg,
char *argv[]) char *argv[])
{ {
GModule *module_self, *module_a, *module_b; GModule *module_self, *module_a, *module_b;
gchar *dir;
gchar *plugin_a, *plugin_b; gchar *plugin_a, *plugin_b;
SimpleFunc f_a, f_b, f_self; SimpleFunc f_a, f_b, f_self;
GModuleFunc gmod_f; GModuleFunc gmod_f;
@ -95,8 +94,6 @@ main (int arg,
plugin_a = g_build_filename (datapath, "libmoduletestplugin_a", NULL); plugin_a = g_build_filename (datapath, "libmoduletestplugin_a", NULL);
plugin_b = g_build_filename (datapath, "libmoduletestplugin_b", NULL); plugin_b = g_build_filename (datapath, "libmoduletestplugin_b", NULL);
g_free (dir);
/* module handles */ /* module handles */
module_self = g_module_open (NULL, G_MODULE_BIND_LAZY); module_self = g_module_open (NULL, G_MODULE_BIND_LAZY);

4
tests/run-assert-msg-test.sh
View File

@ -29,7 +29,7 @@ fi
echo_v "Running assert-msg-test" echo_v "Running assert-msg-test"
OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort" OUT=$(./assert-msg-test 2>&1) && fail "assert-msg-test should abort"
echo "$OUT" | grep -q '^ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \ echo "$OUT" | grep -q '^GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)' || \
fail "does not print assertion message" fail "does not print assertion message"
if ! type gdb >/dev/null 2>&1; then if ! type gdb >/dev/null 2>&1; then
@ -41,7 +41,7 @@ echo_v "Running gdb on assert-msg-test"
OUT=$($LIBTOOL --mode=execute gdb --batch -x ${srcdir:-.}/assert-msg-test.gdb ./assert-msg-test 2> $error_out) || fail "failed to run gdb" OUT=$($LIBTOOL --mode=execute gdb --batch -x ${srcdir:-.}/assert-msg-test.gdb ./assert-msg-test 2> $error_out) || fail "failed to run gdb"
echo_v "Checking if assert message is in __glib_assert_msg" echo_v "Checking if assert message is in __glib_assert_msg"
if ! echo "$OUT" | grep -q '^$1.*"ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then if ! echo "$OUT" | grep -q '^$1.*"GLib:ERROR:.*assert-msg-test.c:.*:.*main.*: assertion failed: (42 < 0)"'; then
fail "__glib_assert_msg does not have assertion message" fail "__glib_assert_msg does not have assertion message"
fi fi