aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-19 08:30:59 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-19 08:30:59 -0400
commit209332e71ab5a7633ee0c934be017740f3e9552a (patch)
treed9df3626eca6155e1f423380bcf9b3ff5466d6c6 /src
parent312a42fc854a732d5f0fe4d5dcc1f567c2e069f4 (diff)
parent449d190e2e447937893d228e63292512c06cb531 (diff)
downloadtor-209332e71ab5a7633ee0c934be017740f3e9552a.tar.gz
tor-209332e71ab5a7633ee0c934be017740f3e9552a.zip
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
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