diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-19 08:31:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-19 08:31:07 -0400 |
| commit | 0a60a94a558012f3b28162f06216ed5e2a4b5b0c (patch) | |
| tree | 4ec5c1415b58297991c0dd2349840bdac0cbef8f | |
| parent | e0f99404f552e047b268c6c47691143a1491ec72 (diff) | |
| parent | 209332e71ab5a7633ee0c934be017740f3e9552a (diff) | |
| download | tor-0a60a94a558012f3b28162f06216ed5e2a4b5b0c.tar.gz tor-0a60a94a558012f3b28162f06216ed5e2a4b5b0c.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -rw-r--r-- | changes/bug26853 | 3 | ||||
| -rwxr-xr-x | src/test/test_key_expiration.sh | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug26853 b/changes/bug26853 new file mode 100644 index 0000000000..6ee47789b9 --- /dev/null +++ b/changes/bug26853 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Skip an unreliable key expiration test on Windows, until the underlying + issue in bug 26076 is resolved. Fixes bug 26853; bugfix on 0.3.2.1-alpha. 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 |