aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug268303
-rwxr-xr-xsrc/test/test_keygen.sh8
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug26830 b/changes/bug26830
new file mode 100644
index 0000000000..c002f19530
--- /dev/null
+++ b/changes/bug26830
@@ -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.
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