packets: rename, new packets

2011-05-04 17:44:12 +02:00 · 2011-05-04 17:44:12 +02:00 · c0a6ba7530
parent 4394aa5e0c
commit c0a6ba7530
41 changed files with 35 additions and 44 deletions
--- a/test/Makefile
+++ b/test/Makefile
@ -23,8 +23,8 @@ test: ${TARGETS}
 	./testText
 	./isRoutingVar
 	./getVarType
-	for f in packets/full-*; do echo ">> $$f"; ./testParser $$f; done
-	for f in packets/full-*; do echo ">> $$f"; ./testParser $$f -r; done
+	for f in packets/[0-9]*; do echo ">> $$f"; ./testParser $$f; done
+	for f in packets/[0-9]*; do echo ">> $$f"; ./testParser $$f -r; done

 testServer: CFLAGS := $(subst -std=c99,,${CFLAGS})

@ -41,19 +41,13 @@ netstartrv:
 	./testServer ${PORT} -rv

 nettest:
-	for f in packets/full-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT} | diff -u $$f -; done
+	for f in packets/[0-9]*; do echo ">> $$f"; cat $$f | nc localhost ${PORT} | diff -u $$f -; done

 nettesterr:
-	for f in packets/error-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT}; done
+	for f in packets/err-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT}; done

 splittest:
-	for f in packets/full-*; do echo ">> $$f"; ./splittest.pl $$f ${PORT} | diff -u $$f -; done
-
-nettestp1:
-	(for f in packets/part-1-p*; do cat $$f; done) | nc localhost ${PORT} | diff -u packets/full-1 -
-
-nettestp2:
-	(for f in packets/part-1-length-p*; do cat $$f; done) | nc localhost ${PORT} | diff -u packets/full-1-length -
+	for f in packets/[0-9]*; do echo ">> $$f"; ./splittest.pl $$f ${PORT} | diff -u $$f -; done

 clean:
 	rm -f ${TARGETS}
--- a/test/packets/00-length-no-content
+++ b/test/packets/00-length-no-content
@ -0,0 +1,4 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+0
+|
--- a/test/packets/00-length-no-data
+++ b/test/packets/00-length-no-data
@ -0,0 +1,5 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+16
+_notice_foo_bar
+|
--- a/test/packets/00-method-only
+++ b/test/packets/00-method-only
@ -0,0 +1,3 @@
+
+_notice_foo_bar
+|
--- a/test/packets/00-no-content
+++ b/test/packets/00-no-content
@ -0,0 +1,3 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+|
--- a/test/packets/00-no-data
+++ b/test/packets/00-no-data
@ -0,0 +1,5 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+
+_notice_foo_bar
+|
--- a/test/packets/00-no-entity
+++ b/test/packets/00-no-entity
@ -0,0 +1,6 @@
+:_source	psyc://foo.example.com/
+:_target	psyc://bar.example.com/
+
+_message_private
+OHAI
+|
--- a/test/packets/00-no-routing
+++ b/test/packets/00-no-routing
@ -0,0 +1,4 @@
+
+:_foo	bar
+_notice_foo_bar
+|
--- a/test/packets/full-1
+++ b/test/packets/full-1
--- a/test/packets/full-1-length
+++ b/test/packets/full-1-length
--- a/test/packets/full-1-utf8
+++ b/test/packets/full-1-utf8
--- a/test/packets/full-2-list
+++ b/test/packets/full-2-list
--- a/test/packets/full-3-list
+++ b/test/packets/full-3-list
--- a/test/packets/full-4-circuit
+++ b/test/packets/full-4-circuit
--- a/test/packets/full-5-message-private
+++ b/test/packets/full-5-message-private
--- a/test/packets/full-6-message-private-remote
+++ b/test/packets/full-6-message-private-remote
--- a/test/packets/full-7-dns-fake
+++ b/test/packets/full-7-dns-fake
--- a/test/packets/full-7-dns-invalid
+++ b/test/packets/full-7-dns-invalid
--- a/test/packets/full-8-context-enter
+++ b/test/packets/full-8-context-enter
--- a/test/packets/full-8-context-leave
+++ b/test/packets/full-8-context-leave
--- a/test/packets/error-1-length
+++ b/test/packets/error-1-length
--- a/test/packets/error-2-list
+++ b/test/packets/error-2-list
--- a/test/packets/full-0-no-content
+++ b/test/packets/full-0-no-content
@ -1,3 +0,0 @@
-:_source	psyc://nb.tgbit.net/
-:_target	psyc://nb.tgbit.net/
-|
--- a/test/packets/part-1-length-p1
+++ b/test/packets/part-1-length-p1
@ -1 +0,0 @@
-part-1-p1
--- a/test/packets/part-1-length-p2
+++ b/test/packets/part-1-length-p2
@ -1 +0,0 @@
-part-1-p2
--- a/test/packets/part-1-length-p3
+++ b/test/packets/part-1-length-p3
@ -1,3 +0,0 @@
-hu3r2cm
-85
-:_foo	bar baz
--- a/test/packets/part-1-length-p4
+++ b/test/packets/part-1-length-p4
@ -1 +0,0 @@
-part-1-p4
--- a/test/packets/part-1-length-p5
+++ b/test/packets/part-1-length-p5
@ -1 +0,0 @@
-part-1-p5
--- a/test/packets/part-1-length-p6
+++ b/test/packets/part-1-length-p6
@ -1 +0,0 @@
-part-1-p6
--- a/test/packets/part-1-length-p7
+++ b/test/packets/part-1-length-p7
@ -1 +0,0 @@
-part-1-p7
--- a/test/packets/part-1-length-p8
+++ b/test/packets/part-1-length-p8
@ -1 +0,0 @@
-part-1-p8
--- a/test/packets/part-1-length-p9
+++ b/test/packets/part-1-length-p9
@ -1 +0,0 @@
-part-1-p9
--- a/test/packets/part-1-p1
+++ b/test/packets/part-1-p1
@ -1,2 +0,0 @@
-:_source	psyc://foo/~bar
-:_tar
--- a/test/packets/part-1-p2
+++ b/test/packets/part-1-p2
@ -1,2 +0,0 @@
-get	psyc://bar/~baz
-:_tag	sch1828
--- a/test/packets/part-1-p3
+++ b/test/packets/part-1-p3
@ -1,3 +0,0 @@
-hu3r2cm
-
-:_foo	bar baz
--- a/test/packets/part-1-p4
+++ b/test/packets/part-1-p4
@ -1,2 +0,0 @@
-
-:_abc_def 1
--- a/test/packets/part-1-p5
+++ b/test/packets/part-1-p5
@ -1 +0,0 @@
-1	foo
--- a/test/packets/part-1-p6
+++ b/test/packets/part-1-p6
@ -1,4 +0,0 @@
- bar
-baz
-:_foo_bar	yay
-_message
--- a/test/packets/part-1-p7
+++ b/test/packets/part-1-p7
@ -1,2 +0,0 @@
-_foo_bar
-ohai
--- a/test/packets/part-1-p8
+++ b/test/packets/part-1-p8
@ -1,2 +0,0 @@
- there!
-\o/
--- a/test/packets/part-1-p9
+++ b/test/packets/part-1-p9
@ -1 +0,0 @@
-|