Fix some out-of-tree build bugs

diff --git a/test/test.sh b/test/test.sh
index a4f03effe6c25b2c08d66a4cca8130e64a00cf5a..363ffecc8af0fb3d049cbf1f5a888a6756a3a695 100755 (executable)
--- a/test/test.sh
+++ b/test/test.sh
@@ -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 ;