Fix some out-of-tree build bugs

This commit is contained in:
Nick Mathewson 2013-04-30 14:26:47 -04:00
parent dd4be76f83
commit cbfc35f6b9

View File

@ -28,7 +28,7 @@ fi
TEST_DIR=.
TEST_SRC_DIR=.
T=`echo "$0" | sed -e 's/test.sh$//'`
T=`echo "$0" | sed -e 's/test.sh$//' | sed -e 's/test-script.sh//' `
if test -x "$T/test-init"
then
TEST_DIR="$T"
@ -82,7 +82,7 @@ run_tests () {
fi
done
announce_n " test-dumpevents: "
if python2 -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null; then
if python2 -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null && -f $TEST_SRC_DIR/check-dumpevents; then
if $TEST_DIR/test-dumpevents | python2 $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
then
announce OKAY ;