Changes in / [bd28e6a:a3a3778]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• configure (modified) (3 diffs)
• doc/user-guide/docbook.xsl (modified) (1 diff)
• doc/user-guide/help.xsl (modified) (2 diffs)
• ipc.c (modified) (3 diffs)
• irc.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• lib/Makefile (modified) (1 diff)
• protocols/Makefile (modified) (1 diff)
• protocols/jabber/Makefile (modified) (1 diff)
• protocols/msn/Makefile (modified) (1 diff)
• protocols/oscar/Makefile (modified) (1 diff)
• protocols/yahoo/Makefile (modified) (1 diff)
• storage_xml.c (modified) (1 diff)
• tests/Makefile (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_irc.c (added)
• tests/check_md5.c (added)
• tests/check_nick.c (modified) (2 diffs)
• tests/check_util.c (modified) (1 diff)
• tests/testsuite.h (added)

.bzrignore

@@ -13 +13 @@
 .gdb_history
 tests/check
+*.gcda
+*.gcov
+*.gcno
+*.o

Makefile

@@ -40 +40 @@
 clean: $(subdirs)
         rm -f *.o $(OUTFILE) core utils/bitlbeed encode decode
+        $(MAKE) -C tests clean
 
 distclean: clean $(subdirs)
         rm -f Makefile.settings config.h bitlbee.pc
         find . -name 'DEADJOE' -o -name '*.orig' -o -name '*.rej' -o -name '*~' -exec rm -f {} \;
+        $(MAKE) -C test distclean
 
-check:
+check: all
         $(MAKE) -C tests
+
+gcov: check
+        gcov *.c
 
 install-doc:

configure

@@ -28 +28 @@
 debug=0
 strip=1
+gcov=0
 ipv6=1
 
@@ -67 +68 @@
 --debug=0/1     Disable/enable debugging                $debug
 --strip=0/1     Disable/enable binary stripping         $strip
+--gcov=0/1      Disable/enable test coverage reporting  $gcov
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
@@ -366 +368 @@
 fi
 
+if [ "$gcov" = "1" ]; then
+        echo "CFLAGS+=-ftest-coverage -fprofile-arcs" >> Makefile.settings
+        echo "EFLAGS+=-lgcov" >> Makefile.settings
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then

doc/user-guide/docbook.xsl

@@ -83 +83 @@
 
         <xsl:template name="cmd">
+                <xsl:param name="prefix"/>
                 <xsl:variable name="thiscmd"><xsl:value-of select="$prefix"/><xsl:value-of select="@name"/></xsl:variable>
                 <xsl:attribute name="id">

doc/user-guide/help.xsl

@@ -31 +31 @@
 
         <xsl:template name="subject">
+                <xsl:param name="id"/>
                 <xsl:message><xsl:text>Processing: </xsl:text><xsl:value-of select="$id"/></xsl:message>
                 <xsl:text>?</xsl:text><xsl:value-of select="$id"/><xsl:text>&#10;</xsl:text>
@@ -122 +123 @@
 
         <xsl:template name="cmd">
+                <xsl:param name="prefix"/>
                 <xsl:variable name="thiscmd"><xsl:value-of select="$prefix"/><xsl:value-of select="@name"/></xsl:variable>
                 <xsl:message><xsl:text>Processing command '</xsl:text><xsl:value-of select="$thiscmd"/><xsl:text>'</xsl:text></xsl:message>

ipc.c

@@ -99 +99 @@
         { "die",        0, ipc_master_cmd_die,        0 },
         { "wallops",    1, NULL,                      IPC_CMD_TO_CHILDREN },
-        { "lilo",       1, NULL,                      IPC_CMD_TO_CHILDREN },
+        { "wall",       1, NULL,                      IPC_CMD_TO_CHILDREN },
         { "opermsg",    1, NULL,                      IPC_CMD_TO_CHILDREN },
         { "rehash",     0, ipc_master_cmd_rehash,     0 },
@@ -122 +122 @@
 }
 
-static void ipc_child_cmd_lilo( irc_t *irc, char **cmd )
+static void ipc_child_cmd_wall( irc_t *irc, char **cmd )
 {
         if( !( irc->status & USTATUS_LOGGED_IN ) )
@@ -175 +175 @@
         { "die",        0, ipc_child_cmd_die,         0 },
         { "wallops",    1, ipc_child_cmd_wallops,     0 },
-        { "lilo",       1, ipc_child_cmd_lilo,        0 },
+        { "wall",       1, ipc_child_cmd_wall,        0 },
         { "opermsg",    1, ipc_child_cmd_opermsg,     0 },
         { "rehash",     0, ipc_child_cmd_rehash,      0 },

irc.c

@@ -585 +585 @@
                    the queue. If it's FALSE, we emptied the buffer and saved ourselves some work
                    in the event queue. */
-                if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) )
-                        irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
+                /* Really can't be done as long as the code doesn't do error checking very well:
+                if( bitlbee_io_current_client_write( irc, irc->fd, GAIM_INPUT_WRITE ) ) */
+                
+                /* So just always do it via the event handler. */
+                irc->w_watch_source_id = b_input_add( irc->fd, GAIM_INPUT_WRITE, bitlbee_io_current_client_write, irc );
         }
         

irc_commands.c

@@ -593 +593 @@
         { "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "wallops",     1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-        { "lilo",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+        { "wall",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
         { "rehash",      0, irc_cmd_rehash,      IRC_CMD_OPER_ONLY },
         { "restart",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },

lib/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: lib.o
+check: all
+gcov:
+        gcov *.c
 
 .PHONY: all clean distclean

protocols/Makefile

@@ -26 +26 @@
 # [SH] Phony targets
 all: protocols.o
+check: all
+gcov:
+        gcov *.c
 
 .PHONY: all clean distclean $(subdirs)

protocols/jabber/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: jabber_mod.o
+check: all
+gcov: 
+        gcov *.c
 
 .PHONY: all clean distclean

protocols/msn/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: msn_mod.o
+check: all
+gcov: 
+        gcov *.c
         
 .PHONY: all clean distclean

protocols/oscar/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: oscar_mod.o
+check: all
+gcov:
+        gcov *.c
 
 .PHONY: all clean distclean

protocols/yahoo/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: yahoo_mod.o
+check: all
+gcov: 
+        gcov *.c
 
 .PHONY: all clean distclean

storage_xml.c

@@ -395 +395 @@
         
         strcat( path, "~" );
-        if( ( fd = open( path, O_WRONLY | O_CREAT, 0600 ) ) < 0 )
+        if( ( fd = open( path, O_WRONLY | O_CREAT | O_TRUNC, 0600 ) ) < 0 )
         {
                 irc_usermsg( irc, "Error while opening configuration file." );

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)