Merging test suite fixes from Jelmer.

5 files changed, 13 insertions, 12 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 12ba8497..d77fb1d1 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,9 +3,10 @@ ifdef _SRCDIR_
 _SRCDIR_ := $(_SRCDIR_)tests/
 endif
 
-LFLAGS +=-lcheck
+CFLAGS += $(shell pkg-config --cflags check)
+LFLAGS += $(shell pkg-config --libs check)
 
-all: check 
+all: check
 	./check $(CHECKFLAGS)
 
 clean:
diff --git a/tests/check.c b/tests/check.c
index 9a3043a7..2e55dbc4 100644
--- a/tests/check.c
+++ b/tests/check.c
@@ -3,6 +3,7 @@
 #include <gmodule.h>
 #include <check.h>
 #include <locale.h>
+#include <sys/time.h>
 #include "bitlbee.h"
 #include "testsuite.h"
 
@@ -81,7 +82,6 @@ int main (int argc, char **argv)
 		{"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL },
 		{ NULL }
 	};
-	int i;
 
 	pc = g_option_context_new("");
 	g_option_context_add_main_entries(pc, options, NULL);
diff --git a/tests/check_help.c b/tests/check_help.c
index 5a2f28d9..a6c127ea 100644
--- a/tests/check_help.c
+++ b/tests/check_help.c
@@ -11,7 +11,7 @@ START_TEST(test_help_initfree)
 	r = help_init(&h, "/dev/null");
 	fail_if(r == NULL);
 	fail_if(r != h);
-	
+
 	help_free(&h);
 	fail_if(h != NULL);
 END_TEST
@@ -20,6 +20,7 @@ START_TEST(test_help_nonexistent)
 	help_t *h, *r;
 	r = help_init(&h, "/dev/null");
 	fail_unless(help_get(&h, "nonexistent") == NULL);
+	fail_if(r == NULL);
 END_TEST
 
 Suite *help_suite (void)
diff --git a/tests/check_md5.c b/tests/check_md5.c
index 4b99d300..a9c31f4f 100644
--- a/tests/check_md5.c
+++ b/tests/check_md5.c
@@ -36,7 +36,6 @@ static void check_sums(int l)
 		md5_byte_t sum[16];
   		tcase_fn_start (tests[i].str, __FILE__, __LINE__);
 		md5_state_t state;
-		int di;
 
 		md5_init(&state);
 		md5_append(&state, (const md5_byte_t *)tests[i].str, strlen(tests[i].str));
diff --git a/tests/check_set.c b/tests/check_set.c
index 29e3c8c8..5df63270 100644
--- a/tests/check_set.c
+++ b/tests/check_set.c
@@ -25,7 +25,7 @@ START_TEST(test_set_add_existing)
 END_TEST
 
 START_TEST(test_set_find_unknown)
-	set_t *s = NULL, *t;
+	set_t *s = NULL;
 	fail_unless (set_find(&s, "foo") == NULL);
 END_TEST
 
@@ -68,8 +68,8 @@ END_TEST
 
 START_TEST(test_set_get_str_value)
 	void *data = "data";
-	set_t *s = NULL, *t;
-	t = set_add(&s, "name", "default", NULL, data);
+	set_t *s = NULL;
+	set_add(&s, "name", "default", NULL, data);
 	set_setstr(&s, "name", "foo");
 	fail_unless(strcmp(set_getstr(&s, "name"), "foo") == 0);
 END_TEST
@@ -81,16 +81,16 @@ END_TEST
 
 START_TEST(test_setint)
 	void *data = "data";
-	set_t *s = NULL, *t;
-	t = set_add(&s, "name", "10", NULL, data);
+	set_t *s = NULL;
+	set_add(&s, "name", "10", NULL, data);
 	set_setint(&s, "name", 3);
 	fail_unless(set_getint(&s, "name") == 3);
 END_TEST
 
 START_TEST(test_setstr)
 	void *data = "data";
-	set_t *s = NULL, *t;
-	t = set_add(&s, "name", "foo", NULL, data);
+	set_t *s = NULL;
+	set_add(&s, "name", "foo", NULL, data);
 	set_setstr(&s, "name", "bloe");
 	fail_unless(strcmp(set_getstr(&s, "name"), "bloe") == 0);
 END_TEST