aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-17 14:56:52 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-17 14:56:52 -0400
commit61a2762e353f29b8b4402bf068e6268809174702 (patch)
tree09744152acc3575320ef0dd7a2195343a519d10c /src
parent98ee23ca1e09cb6ac9e4b8e4bca67557ebb69906 (diff)
parent6dafddd05dcbf65626d7cff2250955d8799e975d (diff)
downloadtor-61a2762e353f29b8b4402bf068e6268809174702.tar.gz
tor-61a2762e353f29b8b4402bf068e6268809174702.zip
Merge branch 'maint-0.2.9' into maint-0.3.2
Diffstat (limited to 'src')
-rwxr-xr-xsrc/test/test_keygen.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh
index 87012cd283..4106425cb3 100755
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@ -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