Make check-dumpevents work with out-of-tree builds

This commit is contained in:
Nick Mathewson 2012-04-03 14:51:51 -04:00
parent f7b8200ca7
commit 55e8dc1ba2

View File

@ -27,12 +27,17 @@ then
fi fi
TEST_DIR=. TEST_DIR=.
TEST_SRC_DIR=.
T=`echo "$0" | sed -e 's/test.sh$//'` T=`echo "$0" | sed -e 's/test.sh$//'`
if test -x "$T/test-init" if test -x "$T/test-init"
then then
TEST_DIR="$T" TEST_DIR="$T"
fi fi
if test -e "$T/check-dumpevents.py"
then
TEST_SRC_DIR="$T"
fi
setup () { setup () {
EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE
@ -107,7 +112,7 @@ run_tests () {
fi fi
announce_n " test-dumpevents: " announce_n " test-dumpevents: "
if python -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then if python -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then
if $TEST_DIR/test-dumpevents | python $TEST_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ; if $TEST_DIR/test-dumpevents | python $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
then then
announce OKAY ; announce OKAY ;
else else