Merge branch 'maint-0.3.4' into release-0.3.4

This commit is contained in:
Nick Mathewson 2018-07-19 08:31:07 -04:00
commit 9905289fe9
2 changed files with 11 additions and 0 deletions

3
changes/bug26853 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (continuous integration):
- Skip an unreliable key expiration test on Windows, until the underlying
issue in bug 26076 is resolved. Fixes bug 26853; bugfix on 0.3.2.1-alpha.

View File

@ -13,6 +13,14 @@ if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then
fi
fi
UNAME_OS=`uname -s | cut -d_ -f1`
if test "$UNAME_OS" = 'CYGWIN' || \
test "$UNAME_OS" = 'MSYS' || \
test "$UNAME_OS" = 'MINGW'; then
echo "This test is unreliable on Windows. See trac #26076. Skipping." >&2
exit 77
fi
if [ $# -ge 1 ]; then
TOR_BINARY="${1}"
shift