Add missing header to ircd_string.h; add debug logging to test scripts.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1426 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index ef85125d20252952f9eca276acc0269d2062453e..4201d70eaf4778936af1b2190d18bc945f9591d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,17 @@
-2005-05-13  Michael Poole <mdpoole@troilus.org>
+2005-06-16  Michael Poole <mdpoole@troilus.org>
+
+       * include/ircd_string.h: Include necessary <string.h> header.
+
+       * ircd/test/.cvsignore: Ignore log output files.
+
+       * ircd/test/Makefile.in: Remove log output files.
+
+       * ircd/test/kill-block-1.cmd: Add sleeps to try to trigger Kills.
+
+       * ircd/test/run-tests.sh: Switch sense of argument.  Send an IRC
+       debug dump to log files.
+
+2005-06-13  Michael Poole <mdpoole@troilus.org>
 
        * ircd/s_user.c (make_user): Unconditionally increment userCount.
        (free_user): Unconditionally decrement it here.
@@ -11,7 +24,7 @@
        ban-walking loop.  Add missing "e" to "members".
 
 
-2005-05-10  Michael Poole <mdpoole@troilus.org>
+2005-06-10  Michael Poole <mdpoole@troilus.org>
 
        * ircd/match.c (check_if_ipmask): Strings that contain '?' cannot
        be true IP masks.

diff --git a/include/ircd_string.h b/include/ircd_string.h
index 888cfb33de36e43d4ae89861ca014f6b674167f6..7562135fc0b06da62373aff54ca79b5ab701c3db 100644 (file)
--- a/include/ircd_string.h
+++ b/include/ircd_string.h
@@ -4,6 +4,9 @@
  */
 #ifndef INCLUDED_ircd_string_h
 #define INCLUDED_ircd_string_h
+
+#include <string.h> /* for DupString()'s strcpy, strlen */
+
 #ifndef INCLUDED_ircd_chattr_h
 #include "ircd_chattr.h"
 #endif

diff --git a/ircd/test/.cvsignore b/ircd/test/.cvsignore
index 58278b30ea3b0047c023eedbcc7eadd509a0eab8..f7c2a2155c5104d8a121ee95fa29bbb92fb0722b 100644 (file)
--- a/ircd/test/.cvsignore
+++ b/ircd/test/.cvsignore
@@ -2,3 +2,4 @@ Makefile
 ircd_chattr_t
 ircd_in_addr_t
 ircd_string_t
+*.log

diff --git a/ircd/test/Makefile.in b/ircd/test/Makefile.in
index 44b4cda0914be5b1cff082115bb8a6825b26fd82..47850c5bffa6ed4d1df4b1b538bf1d3ce587548d 100644 (file)
--- a/ircd/test/Makefile.in
+++ b/ircd/test/Makefile.in
@@ -60,7 +60,7 @@ distclean: clean
        rm -f Makefile
 
 clean:
-       rm -f core *.o ${TESTPROGS}
+       rm -f core *.o *.log ${TESTPROGS}
 
 # DO NOT DELETE THIS LINE (or the blank line after it) -- make depend depends on them.
 

diff --git a/ircd/test/kill-block-1.cmd b/ircd/test/kill-block-1.cmd
index a9e4f261924973c869a7a80c76b87e2d32bc57b5..d76962f27d9fabd391a44385bff9dd65ad284f9e 100644 (file)
--- a/ircd/test/kill-block-1.cmd
+++ b/ircd/test/kill-block-1.cmd
@@ -2,3 +2,5 @@ define srv localhost:7701
 
 connect cl1 Alex sub7 %srv% :s7server
 connect cl2 Chloe chloe %srv% :Chloe
+cl1 sleep 30
+cl2 sleep 30

diff --git a/ircd/test/run-tests.sh b/ircd/test/run-tests.sh
index a6605d62a95018baa7f35a1cdf39e38161e1d8be..d16cf04171bfebb8fa3d62e1bd2390bea14cdeee 100755 (executable)
--- a/ircd/test/run-tests.sh
+++ b/ircd/test/run-tests.sh
@@ -1,19 +1,22 @@
 #! /bin/sh
+
 set -e
-srcdir=$1
+srcdir=`dirname $0`
+ircdir=$1
+
 cp ${srcdir}/ircd-t1.conf ircd-t1.conf
 cp ${srcdir}/ircd-t2.conf ircd-t2.conf
 echo "Testing one-shot ircd invocations."
-../ircd -v
-../ircd -x 6 -k -d . -f ircd-t1.conf -c user@127.0.0.1
+${ircdir}/ircd -v
+${ircdir}/ircd -x 6 -k -d . -f ircd-t1.conf -c user@127.0.0.1
 echo "Starting ircd."
-../ircd -d . -f ircd-t1.conf
-../ircd -d . -f ircd-t2.conf
+${ircdir}/ircd -d . -f ircd-t1.conf
+${ircdir}/ircd -d . -f ircd-t2.conf
 sleep 10
 # stats-1 is out of alphabetical order to avoid triggering IPcheck.
-for script in channel-1 client-1 command-1 feature-1 gline-1 stats-1 jupe-1 kill-block-1 ; do
+for script in channel-1 client-1 commands-1 feature-1 gline-1 stats-1 jupe-1 kill-block-1 ; do
   echo "Running test $script."
-  ${srcdir}/test-driver.pl ${srcdir}/${script}.cmd
+  ${srcdir}/test-driver.pl -D ${srcdir}/${script}.cmd 2> ${script}.log
 done
 echo "Sending signals to server."
 cp ${srcdir}/ircd-t1-2.conf ircd-t1.conf
@@ -24,4 +27,4 @@ kill -INT `cat ircd-t1.pid`
 sleep 610
 kill -TERM `cat ircd-t1.pid` `cat ircd-t2.pid`
 sleep 1
-../ircd -? || true
+${ircdir}/ircd -? || true