Changes in / [55078f5:d8d63a2]

Files:

• .bzrignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• configure (modified) (3 diffs)
• 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)
• tests/Makefile (modified) (1 diff)
• tests/check_nick.c (modified) (1 diff)

.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

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
 
 .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

tests/Makefile

@@ -3 +3 @@
 LFLAGS +=-lcheck
 
-all: check
+all: check 
         ./check
+
+clean:
+        rm -f check *.o
 
 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 
 
-check: check.o check_util.o check_nick.o $(addprefix ../, $(main_objs)) ../protocols/protocols.o
+test_objs = check.o check_util.o check_nick.o
+
+check: $(test_objs) $(addprefix ../, $(main_objs)) ../protocols/protocols.o
         @echo '*' Linking $@
         @$(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) $(EFLAGS)

tests/check_nick.c

@@ -23 +23 @@
 
         for (i = 0; get[i]; i++) {
-                char copy[30];
+                char copy[60];
                 strcpy(copy, get[i]);
                 nick_strip(copy);