From: Hal Murray <murray@ntp.org>
Date: Sat, 20 Jul 2013 23:56:47 +0000 (-0400)
Subject: test.sh, ChangeLog:
X-Git-Tag: NTP_4_2_7P374~1^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=323747f6c714579c059323b5673ca38a2823cf01;p=thirdparty%2Fntp.git

test.sh, ChangeLog:
  Fix bug 2368

bk: 51eb23bfAE0kWzwTd9nMQr8rG63SQw
---

diff --git a/ChangeLog b/ChangeLog
index 8a13b1765..dd89e2005 100644
--- 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 a4f03effe..e12aaa61d 100755
--- 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