summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-19 08:31:07 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-19 08:31:07 -0400
commit27f5bd52fea3a18daadc455e9e044e997753c93d (patch)
tree8f8b98dfaa40ab5b0a3849a33a4ce48ddc106c99 /src
parentd5dd500e36093499984e58882b07d2b9a5628235 (diff)
parent0a60a94a558012f3b28162f06216ed5e2a4b5b0c (diff)
downloadtor-27f5bd52fea3a18daadc455e9e044e997753c93d.tar.gz
tor-27f5bd52fea3a18daadc455e9e044e997753c93d.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src')
-rwxr-xr-xsrc/test/test_key_expiration.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index 5511dbf18c..cf6608634d 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.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