diff --git a/Makefile b/Makefile index 0217dcf..f34a99c 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,8 @@ testdebug: debug ${MAKE} -C test debug test: all - ${MAKE} -C test test nettest + ${MAKE} -C test test + # nettest currently unavailable. please debug it. check: test diff --git a/test/Makefile b/test/Makefile index 8475efe..3ac7deb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,3 +1,7 @@ +# 'nettest' is currently broken. testserver is not receiving any of the +# packets that 'nc' is passing to it. this is a bug in the testing suite, +# not in the library. --lynX 2016 + export LD_LIBRARY_PATH = ../lib OPT = -O2 @@ -25,6 +29,8 @@ endif all: ${TARGETS} it: all +check: test + test_psyc: LOADLIBES := ${LOADLIBES} ${LOADLIBES_NET} test_psyc_speed: LOADLIBES := ${LOADLIBES} ${LOADLIBES_NET} #test_psyc_speed: LOADLIBES := ${LOADLIBES_NET} @@ -66,7 +72,7 @@ test: ${TARGETS} nettest: nettestfull nettestsplit -nettestrun: srvstart pkt srvkill +nettestrun: start pkt stop nettestfull: ${MAKE} nettestrun; x=$$?; pkill -x test_psyc; exit $$x @@ -85,11 +91,11 @@ pktsplit: pkterr: for f in packets/err-*; do echo ">> $$f"; cat $$f | nc localhost ${PORT}; done -srvstart: +start: pkill -x test_psyc; exit 0 - ./test_psyc -p ${PORT} -S ${srv_args} & + ./test_psyc -p ${PORT} -S ${srv_args} -vvv & -srvkill: +stop: pkill -x test_psyc bench: bench-genpkts bench-psyc bench-psyc-bin bench-json bench-json-bin bench-xml