test.sh, ChangeLog:

  Fix bug 2368

bk: 51eb23bfAE0kWzwTd9nMQr8rG63SQw

diff --git a/ChangeLog b/ChangeLog
index 8a13b17651d28c02d8974afff2ebe6e5838835b1..dd89e2005ecde6a1565e4303b160cce36eb25bc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2368] make check troubles in libevent
 (4.2.7p368) 2013/05/01 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2145] ntpq dumps core when displaying sys_var_list and more.
 (4.2.7p367) 2013/04/25 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/sntp/libevent/test/test.sh b/sntp/libevent/test/test.sh
index a4f03effe6c25b2c08d66a4cca8130e64a00cf5a..e12aaa61d17e5e90782b89d5362ad6b979db786d 100755 (executable)
--- a/sntp/libevent/test/test.sh
+++ b/sntp/libevent/test/test.sh
@@ -42,6 +42,11 @@ then
 elif test -f "./test/check-dumpevents.py"
 then
         TEST_SRC_DIR="./test"
+elif test -f "../../../sntp/libevent/test/check-dumpevents.py-x"
+then    
+        TEST_SRC_DIR="../../../sntp/libevent/test"
+else
+        echo "### Can't find check-dumpevents.py"
 fi
 
 setup () {
@@ -88,6 +93,7 @@ run_tests () {
                announce OKAY ;
            else
                announce FAILED ;
+               FAILED=yes
            fi
        else
            # no python
@@ -95,6 +101,7 @@ run_tests () {
                announce "OKAY (output not checked)" ;
            else
                announce "FAILED (output not checked)" ;
+               FAILED=yes
            fi
        fi
        test -x $TEST_DIR/regress || return