mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-25 07:07:52 +01:00
Merge branch 'maint-0.2.9' into maint-0.3.2
This commit is contained in:
commit
61a2762e35
2 changed files with 11 additions and 0 deletions
3
changes/bug26830
Normal file
3
changes/bug26830
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
o Minor bugfixes (continuous integration):
|
||||||
|
- Skip an unreliable key generation test on Windows, until the underlying
|
||||||
|
issue in bug 26076 is resolved. Fixes bug 26830; bugfix on 0.2.7.3-rc.
|
|
@ -13,6 +13,14 @@ if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then
|
||||||
fi
|
fi
|
||||||
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
|
if [ $# -ge 1 ]; then
|
||||||
TOR_BINARY="${1}"
|
TOR_BINARY="${1}"
|
||||||
shift
|
shift
|
||||||
|
|
Loading…
Add table
Reference in a new issue