Changeset a3a3778 for tests

Timestamp:

2006-12-22T17:17:08Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5c5a586, 9225e08

Parents:

55078f5 (diff), bd28e6a (diff), a51be64 (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 trees.

Location:

tests

Files:

• Makefile (modified) (1 diff)
• check.c (modified) (2 diffs)
• check_irc.c (added)
• check_md5.c (added)
• check_nick.c (modified) (2 diffs)
• check_util.c (modified) (1 diff)
• testsuite.h (added)

tests/Makefile

@@ -3 +3 @@
 LFLAGS +=-lcheck
 
-all: check
-        ./check
+all: check 
+        ./check $(CHECKFLAGS)
 
-main_objs = account.o bitlbee.o conf.o crypting.o help.o ini.o ipc.o irc.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_text.o url.o user.o util.o 
+clean:
+        rm -f check *.o
 
-check: check.o check_util.o check_nick.o $(addprefix ../, $(main_objs)) ../protocols/protocols.o
+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 
+
+test_objs = check.o check_util.o check_nick.o check_md5.o check_irc.o
+
+check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o ../lib/lib.o
         @echo '*' Linking $@
         @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)

tests/check.c

@@ -4 +4 @@
 #include <check.h>
 #include "bitlbee.h"
+#include "testsuite.h"
 
 global_t global;        /* Against global namespace pollution */
+
+gboolean g_io_channel_pair(GIOChannel **ch1, GIOChannel **ch2)
+{
+        int sock[2];
+        if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNIX, sock) < 0) {
+                perror("socketpair");
+                return FALSE;
+        }
+
+        *ch1 = g_io_channel_unix_new(sock[0]);
+        *ch2 = g_io_channel_unix_new(sock[1]);
+        return TRUE;
+}
 
 double gettime()
@@ -21 +35 @@
 Suite *nick_suite(void);
 
-int main (void)
+/* From check_md5.c */
+Suite *md5_suite(void);
+
+/* From check_irc.c */
+Suite *irc_suite(void);
+
+int main (int argc, char **argv)
 {
         int nf;
-        SRunner *sr = srunner_create(util_suite());
+        SRunner *sr;
+        GOptionContext *pc;
+        gboolean no_fork = FALSE;
+        gboolean verbose = FALSE;
+        GOptionEntry options[] = {
+                {"no-fork", 'n', 0, G_OPTION_ARG_NONE, &no_fork, "Don't fork" },
+                {"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);
+
+        if(!g_option_context_parse(pc, &argc, &argv, NULL))
+                return 1;
+
+        g_option_context_free(pc);
+
+        log_init();
+
+        if (verbose) {
+                log_link( LOGLVL_ERROR, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_DEBUG, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_INFO, LOGOUTPUT_CONSOLE );
+                log_link( LOGLVL_WARNING, LOGOUTPUT_CONSOLE );
+        }
+
+        global.conf = conf_load( 0, NULL);
+        global.conf->runmode = RUNMODE_DAEMON;
+
+        sr = srunner_create(util_suite());
         srunner_add_suite(sr, nick_suite());
-        srunner_run_all (sr, CK_NORMAL);
+        srunner_add_suite(sr, md5_suite());
+        srunner_add_suite(sr, irc_suite());
+        if (no_fork)
+                srunner_set_fork_status(sr, CK_NOFORK);
+        srunner_run_all (sr, verbose?CK_VERBOSE:CK_NORMAL);
         nf = srunner_ntests_failed(sr);
         srunner_free(sr);

tests/check_nick.c

@@ -6 +6 @@
 #include "irc.h"
 #include "set.h"
-#include "util.h"
+#include "misc.h"
 
 START_TEST(test_nick_strip)
@@ -23 +23 @@
 
         for (i = 0; get[i]; i++) {
-                char copy[30];
+                char copy[60];
                 strcpy(copy, get[i]);
                 nick_strip(copy);

tests/check_util.c

@@ -6 +6 @@
 #include "irc.h"
 #include "set.h"
-#include "util.h"
+#include "misc.h"
 
 START_TEST(test_strip_linefeed)