pretty blind try at merging in the latest trunk

2 files changed, 1 insertions, 9 deletions

diff --git a/tests/Makefile b/tests/Makefile
index db145503..1bcf8f72 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -10,7 +10,7 @@ clean:
 
 distclean: clean
 
-main_objs = account.o bitlbee.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o
+main_objs = account.o bitlbee.o chat.o conf.o crypting.o help.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o storage_text.o user.o
 
 test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_crypting.o check_set.o check_jabber_sasl.o check_jabber_util.o
 
diff --git a/tests/check_set.c b/tests/check_set.c
index b1ea973d..29e3c8c8 100644
--- a/tests/check_set.c
+++ b/tests/check_set.c
@@ -95,13 +95,6 @@ START_TEST(test_setstr)
 	fail_unless(strcmp(set_getstr(&s, "name"), "bloe") == 0);
 END_TEST
 
-START_TEST(test_setstr_implicit)
-	void *data = "data";
-	set_t *s = NULL, *t;
-	set_setstr(&s, "name", "bloe");
-	fail_unless(set_find(&s, "name") != NULL);
-END_TEST
-
 START_TEST(test_set_get_int_unknown)
 	set_t *s = NULL;
 	fail_unless(set_getint(&s, "foo") == 0);
@@ -125,6 +118,5 @@ Suite *set_suite (void)
 	tcase_add_test (tc_core, test_set_get_int_unknown);
 	tcase_add_test (tc_core, test_setint);
 	tcase_add_test (tc_core, test_setstr);
-	tcase_add_test (tc_core, test_setstr_implicit);
 	return s;
 }