Changeset 7b05842

Timestamp:

2014-04-25T08:03:59Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b95b0c8

Parents:

b4008a5 (diff), 6a6d7d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging test suite fixes from Jelmer.

Location:

tests

Files:

• Makefile (modified) (1 diff)
• check.c (modified) (2 diffs)
• check_help.c (modified) (2 diffs)
• check_md5.c (modified) (1 diff)
• check_set.c (modified) (4 diffs)

tests/Makefile

@@ -4 +4 @@
 endif
 
-LFLAGS +=-lcheck
+CFLAGS += $(shell pkg-config --cflags check)
+LFLAGS += $(shell pkg-config --libs check)
 
-all: check 
+all: check
         ./check $(CHECKFLAGS)
 

tests/check.c

@@ -4 +4 @@
 #include <check.h>
 #include <locale.h>
+#include <sys/time.h>
 #include "bitlbee.h"
 #include "testsuite.h"
@@ -82 +83 @@
                 { NULL }
         };
-        int i;
 
         pc = g_option_context_new("");

tests/check_help.c

@@ -12 +12 @@
         fail_if(r == NULL);
         fail_if(r != h);
-        
+
         help_free(&h);
         fail_if(h != NULL);
@@ -21 +21 @@
         r = help_init(&h, "/dev/null");
         fail_unless(help_get(&h, "nonexistent") == NULL);
+        fail_if(r == NULL);
 END_TEST
 

tests/check_md5.c

@@ -37 +37 @@
                 tcase_fn_start (tests[i].str, __FILE__, __LINE__);
                 md5_state_t state;
-                int di;
 
                 md5_init(&state);

tests/check_set.c

@@ -26 +26 @@
 
 START_TEST(test_set_find_unknown)
-        set_t *s = NULL, *t;
+        set_t *s = NULL;
         fail_unless (set_find(&s, "foo") == NULL);
 END_TEST
@@ -69 +69 @@
 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);
@@ -82 +82 @@
 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);
@@ -90 +90 @@
 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);