diff --git a/tests/runtests b/tests/runtests index fbfceba..52874e0 100755 --- a/tests/runtests +++ b/tests/runtests @@ -12,28 +12,41 @@ Domain example.net KeyFileEd25519 testkey.key SelectorEd25519 testkey Socket unix:signing.sock -PidFile milter.pid +PidFile signing.pid Mode s UserID $(id --name --user):$(id --name --group) EOF -rm -f milter.pid milter.sock + +cat > verify.conf < stderr:\n" - cat stderr - printf -- "-> end stderr\n" + if [ -s verify.pid ] && kill -0 "$(cat verify.pid)"; then + kill "$(cat verify.pid)" fi + wait + for errdata in signing.stderr verify.stderr; do + if [ -s "$errdata" ]; then + printf -- "-> %s:\n" "$errdata" + cat "$errdata" + printf -- "-> end %s\n" "$errdata" + fi + done rm -rf "$WORKDIR" } -PYTHONPATH="$(dirname "$TESTDIR")" dkimpy-milter signing.conf 2>stderr & +PYTHONPATH="$(dirname "$TESTDIR")" dkimpy-milter signing.conf 2>signing.stderr & +PYTHONPATH="$(dirname "$TESTDIR")" dkimpy-milter verify.conf 2>verify.stderr & trap cleanup EXIT # ugly ugly (how are we supposed to know that the filter is ready?):