summaryrefslogtreecommitdiff
path: root/src/test
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
commit0a60a94a558012f3b28162f06216ed5e2a4b5b0c (patch)
tree4ec5c1415b58297991c0dd2349840bdac0cbef8f /src/test
parente0f99404f552e047b268c6c47691143a1491ec72 (diff)
parent209332e71ab5a7633ee0c934be017740f3e9552a (diff)
downloadtor-0a60a94a558012f3b28162f06216ed5e2a4b5b0c.tar.gz
tor-0a60a94a558012f3b28162f06216ed5e2a4b5b0c.zip
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/test')
-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