Update tests code

diff --git a/mkfile b/mkfile
index 300ac9d7edb60e6b6e034ee5e064fa1a9fd7bd22..e9a6d991f1c80388eea97a54436626bebbfe4423 100644 (file)
--- a/mkfile
+++ b/mkfile
@@ -2,10 +2,12 @@ CFLAGS   = -g -Wall -fPIC --std=c99
 CPPFLAGS = -I/usr/include/awk -I. -DHAVE_CONFIG_H
 
 test:Q:
+       rm -f var/sp_cur.json
        #awk -f rhawk < testirc.txt
        #awk -f rhawk < testirc.txt
        awk -f test.awk test.txt \
-       | awk '-vDEBUG=1' -frhawk \
+       | awk '-vDEBUG=1' -frhawk 2>&1 \
+       | grep -v '^  >\|USER\|NICK\|CAP\|JOIN\|TOPIC\|WHO\|unicode'
        #| grep 'points\|bid\|took'
 
 test-select:Q: select.so

diff --git a/test.awk b/test.awk
index 7e208a03e99e197609ea2bd2896a3bcc30ad796f..3758f284d00d05981fcf541595400bb2dd70564d 100644 (file)
--- a/test.awk
+++ b/test.awk
@@ -1,7 +1,7 @@
 # Functions
 function say(who, msg)
 {
-       print ":" who "! PRIVMSG #rhtest :" msg
+       print ":" who"!u@h PRIVMSG #rhtest :" msg
 }
 
 function error(msg)