Add debug command and update test cases

diff --git a/irc.awk b/irc.awk
index 7feb95319a2d8b62be40fdfe9229783e7deb0e50..9b071c91d88def919002b2e92e1fad30e358a9dd 100644 (file)
--- a/irc.awk
+++ b/irc.awk
@@ -21,7 +21,8 @@
 function send(msg) {
        print "  > " msg > "/dev/stderr"
        print msg
-       system("sleep 1")
+       if (!DEBUG)
+               system("sleep 1")
        fflush()
 }
 
@@ -101,13 +102,17 @@ function topic(chan, msg) {
 BEGIN {
        if (CHILD == "") {
                debug("Starting server");
-               cmd = "awk -f rhawk -v CHILD=1 -v START=" systime();
+               cmd = "awk -f rhawk" \
+                     " -v CHILD=1" \
+                     " -v START=" systime() \
+                     " -v DEBUG=" !!DEBUG
                status = system(cmd " -v FIRST=1");
                while (status)
                        status = system(cmd);
                exit(0);
        } else {
                debug("Starting child:" \
+                     " DEBUG=" DEBUG   \
                      " CHILD=" CHILD   \
                      " START=" START   \
                      " FIRST=" FIRST);

diff --git a/mkfile b/mkfile
index 138af83407c7495e14045256b834d05fbaa3c30a..300ac9d7edb60e6b6e034ee5e064fa1a9fd7bd22 100644 (file)
--- a/mkfile
+++ b/mkfile
@@ -1,11 +1,15 @@
 CFLAGS   = -g -Wall -fPIC --std=c99
 CPPFLAGS = -I/usr/include/awk -I. -DHAVE_CONFIG_H
 
-test:Q: select.so
-       awk -f select.awk
+test:Q:
        #awk -f rhawk < testirc.txt
        #awk -f rhawk < testirc.txt
-       #awk -f test.awk test.txt | awk -f rhawk #| grep 'points\|bid\|took'
+       awk -f test.awk test.txt \
+       | awk '-vDEBUG=1' -frhawk \
+       #| grep 'points\|bid\|took'
+
+test-select:Q: select.so
+       #awk -f select.awk
 
 %.so: %.o
        gcc $CFLAGS -shared -o $target $prereq $LDFLAGS

diff --git a/test.awk b/test.awk
index 821062678418c814c00c2ac4fdd461eb0b4311ab..7e208a03e99e197609ea2bd2896a3bcc30ad796f 100644 (file)
--- a/test.awk
+++ b/test.awk
@@ -28,6 +28,7 @@ function command(who, cmd)
        else if (cmd ~ /^s/)      say(who, ".score")
        else if (cmd ~ /^B/)      say(who, ".bids")
        else if (cmd ~ /^t/)      say(who, ".tricks")
+       else if (cmd ~ /^T/)      say(who, ".turn")
        else if (cmd ~ /^p/)      say(who, ".pass " arg)
        else if (arg ~ /[shdc]$/) say(who, ".play " arg)
        else                      error("unknown cmd '" cmd "'")

diff --git a/test.txt b/test.txt
index 2b70101fca93b4fc822f85d09e4c104c6ff8919d..45ea615c5c331f0aa4d912cf211d4b0c16c19ef6 100644 (file)
--- a/test.txt
+++ b/test.txt
@@ -18,29 +18,35 @@
 #   l    - look
 #   bn   - bid n
 #   s    - score
+#   B    - bids
+#   t    - tricks
+#   t    - tricks
+#   T    - turn
+#   pn   - pass card n
 #   card - play card
 #  -card - play but don't add to deck
 #  +card - add to deck but don't play
 
 # Test scoring
-#x: s s s s s s s  s  s  s  s  s
-#x: B B B B B B B  B  B  B  B  B
-#x: t t t t t t t  t  t  t  t  t
-#A: n j . . . d b3 .  .  .  As .
-#b: . . j . . d .  b3 .  .  Ah .
-#c: . . . j . d .  .  b3 .  Ad .
-#d: . . . . j d .  .  .  b3 Ac .
+x: s s s s s s s  s  s  s  s  s
+x: B B B B B B B  B  B  B  B  B
+x: t t t t t t t  t  t  t  t  t
+x: T T T T T T T  T  T  T  T  T
+A: n j . . . d b3 .  .  .  As .
+b: . . j . . d .  b3 .  .  Ah .
+c: . . . j . d .  .  b3 .  Ad .
+d: . . . . j d .  .  .  b3 Ac .
 
 # Nil/blind
-a: n j d l b0  .  .    As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t e
-b: . j d . b0 +Ah pAh -Ac Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
-c: . j d . b7  .  .    Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
-d: . j d . b7 +Ac pAc -Ah Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .
+#a: n j d l b0  .  .    As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t e
+#b: . j d . b0 +Ah pAh -Ac Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
+#c: . j d . b7  .  .    Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
+#d: . j d . b7 +Ac pAc -Ah Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .
 
 # Test full game
-#a: n j d . b1  +Ah As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t
-#b: . j d . b3   .  Ah Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
-#c: . j d . b1   .  Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
-#d: . j d . b0   .  Ac Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .
+#a: n j d l b1  -Ah As Ks Qs Js 10s 9s 8s 7s 6s 5s 4s 3s 2s t
+#b: . j d l b3   .  Ah Kh Qh Jh 10h 9h 8h 7h 6h 5h 4h 3h 2h s
+#c: . j d l b1   .  Ad Kd Qd Jd 10d 9d 8d 7d 6d 5d 4d 3d 2d .
+#d: . j d l b2   .  Ac Kc Qc Jc 10c 9c 8c 7c 6c 5c 4c 3c 2c .
 
 # vim: ft=conf