Allow the user to redirect the verbose output of test/test.sh to a file

By default, the test.sh script still suppresses the output of all the
tests it invokes.  Now, however, you can have that output written to
a file specified in the TEST_OUTPUT_FILE shell variable.
This commit is contained in:
Nick Mathewson 2009-12-29 17:59:55 -05:00
parent 1e56a32d08
commit c382de6421

View File

@ -1,5 +1,11 @@
#!/bin/sh #!/bin/sh
if [ "x$TEST_OUTPUT_FILE" = "x" ]; then
TEST_OUTPUT_FILE=/dev/null
fi
touch "$TEST_OUTPUT_FILE" || exit 1;
setup () { setup () {
EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE
EVENT_NODEVPOLL=yes; export EVENT_NODEVPOLL EVENT_NODEVPOLL=yes; export EVENT_NODEVPOLL
@ -9,82 +15,87 @@ setup () {
EVENT_NOEVPORT=yes; export EVENT_NOEVPORT EVENT_NOEVPORT=yes; export EVENT_NOEVPORT
} }
announce () {
echo $@
echo $@ >>"$TEST_OUTPUT_FILE"
}
test () { test () {
if ./test-init 2>/dev/null ; if ./test-init 2>>"$TEST_OUTPUT_FILE" ;
then then
true true
else else
echo Skipping test announce Skipping test
return return
fi fi
echo -n " test-eof: " announce -n " test-eof: "
if ./test-eof >/dev/null ; if ./test-eof >>"$TEST_OUTPUT_FILE" ;
then then
echo OKAY ; announce OKAY ;
else else
echo FAILED ; announce FAILED ;
fi fi
echo -n " test-weof: " announce -n " test-weof: "
if ./test-weof >/dev/null ; if ./test-weof >>"$TEST_OUTPUT_FILE" ;
then then
echo OKAY ; announce OKAY ;
else else
echo FAILED ; announce FAILED ;
fi fi
echo -n " test-time: " announce -n " test-time: "
if ./test-time >/dev/null ; if ./test-time >>"$TEST_OUTPUT_FILE" ;
then then
echo OKAY ; announce OKAY ;
else else
echo FAILED ; announce FAILED ;
fi fi
echo -n " regress: " announce -n " regress: "
if ./regress >/dev/null ; if ./regress >>"$TEST_OUTPUT_FILE" ;
then then
echo OKAY ; announce OKAY ;
else else
echo FAILED ; announce FAILED ;
fi fi
} }
echo "Running tests:" announce "Running tests:"
# Need to do this by hand? # Need to do this by hand?
setup setup
unset EVENT_NOKQUEUE unset EVENT_NOKQUEUE
export EVENT_NOKQUEUE export EVENT_NOKQUEUE
echo "KQUEUE" announce "KQUEUE"
test test
setup setup
unset EVENT_NODEVPOLL unset EVENT_NODEVPOLL
export EVENT_NODEVPOLL export EVENT_NODEVPOLL
echo "DEVPOLL" announce "DEVPOLL"
test test
setup setup
unset EVENT_NOPOLL unset EVENT_NOPOLL
export EVENT_NOPOLL export EVENT_NOPOLL
echo "POLL" announce "POLL"
test test
setup setup
unset EVENT_NOSELECT unset EVENT_NOSELECT
export EVENT_NOSELECT export EVENT_NOSELECT
echo "SELECT" announce "SELECT"
test test
setup setup
unset EVENT_NOEPOLL unset EVENT_NOEPOLL
export EVENT_NOEPOLL export EVENT_NOEPOLL
echo "EPOLL" announce "EPOLL"
test test
setup setup
unset EVENT_NOEVPORT unset EVENT_NOEVPORT
export EVENT_NOEVPORT export EVENT_NOEVPORT
echo "EVPORT" announce "EVPORT"
test test