Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-06-17 02:52:05 UTC
Modified files:
ircd/test/run-tests.sh ircd/test/kill-block-1.cmd
ircd/test/Makefile.in ircd/test/.cvsignore include/ircd_string.h
ChangeLog
Log message:
Add missing header to ircd_string.h; add debug logging to test scripts.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.644 ircu2.10/ChangeLog:1.645
--- ircu2.10/ChangeLog:1.644 Mon Jun 13 21:47:00 2005
+++ ircu2.10/ChangeLog Thu Jun 16 19:51:55 2005
@@ -1,4 +1,17 @@
-2005-05-13 Michael Poole <[EMAIL PROTECTED]>
+2005-06-16 Michael Poole <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
+2005-06-10 Michael Poole <[EMAIL PROTECTED]>
* ircd/match.c (check_if_ipmask): Strings that contain '?' cannot
be true IP masks.
Index: ircu2.10/include/ircd_string.h
diff -u ircu2.10/include/ircd_string.h:1.9 ircu2.10/include/ircd_string.h:1.10
--- ircu2.10/include/ircd_string.h:1.9 Mon May 30 14:07:33 2005
+++ ircu2.10/include/ircd_string.h Thu Jun 16 19:51:54 2005
@@ -1,9 +1,12 @@
/** @file ircd_string.h
* @brief Public declarations and APIs for string operations.
- * @version $Id: ircd_string.h,v 1.9 2005/05/30 21:07:33 entrope Exp $
+ * @version $Id: ircd_string.h,v 1.10 2005/06/17 02:51:54 entrope Exp $
*/
#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
Index: ircu2.10/ircd/test/.cvsignore
diff -u ircu2.10/ircd/test/.cvsignore:1.1 ircu2.10/ircd/test/.cvsignore:1.2
--- ircu2.10/ircd/test/.cvsignore:1.1 Mon Jan 3 16:17:12 2005
+++ ircu2.10/ircd/test/.cvsignore Thu Jun 16 19:51:54 2005
@@ -2,3 +2,4 @@
ircd_chattr_t
ircd_in_addr_t
ircd_string_t
+*.log
Index: ircu2.10/ircd/test/Makefile.in
diff -u ircu2.10/ircd/test/Makefile.in:1.5 ircu2.10/ircd/test/Makefile.in:1.6
--- ircu2.10/ircd/test/Makefile.in:1.5 Mon May 30 17:26:19 2005
+++ ircu2.10/ircd/test/Makefile.in Thu Jun 16 19:51:54 2005
@@ -60,7 +60,7 @@
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.
Index: ircu2.10/ircd/test/kill-block-1.cmd
diff -u ircu2.10/ircd/test/kill-block-1.cmd:1.1
ircu2.10/ircd/test/kill-block-1.cmd:1.2
--- ircu2.10/ircd/test/kill-block-1.cmd:1.1 Mon May 30 17:26:19 2005
+++ ircu2.10/ircd/test/kill-block-1.cmd Thu Jun 16 19:51:54 2005
@@ -2,3 +2,5 @@
connect cl1 Alex sub7 %srv% :s7server
connect cl2 Chloe chloe %srv% :Chloe
+cl1 sleep 30
+cl2 sleep 30
Index: ircu2.10/ircd/test/run-tests.sh
diff -u ircu2.10/ircd/test/run-tests.sh:1.2 ircu2.10/ircd/test/run-tests.sh:1.3
--- ircu2.10/ircd/test/run-tests.sh:1.2 Mon May 30 17:26:19 2005
+++ ircu2.10/ircd/test/run-tests.sh Thu Jun 16 19:51:54 2005
@@ -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 [EMAIL PROTECTED]
+${ircdir}/ircd -v
+${ircdir}/ircd -x 6 -k -d . -f ircd-t1.conf -c [EMAIL PROTECTED]
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 @@
sleep 610
kill -TERM `cat ircd-t1.pid` `cat ircd-t2.pid`
sleep 1
-../ircd -? || true
+${ircdir}/ircd -? || true
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
