July 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 209332e71ab5a7633ee0c934be017740f3e9552a Merge: 312a42fc8 449d190e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:30:59 2018 -0400 Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 0a60a94a558012f3b28162f06216ed5e2a4b5b0c Merge: e0f99404f 209332e71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit b44fce67163cadbb951005416808b9b217c67639 Merge: 144fc9bef 27f5bd52f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:32:00 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 27f5bd52fea3a18daadc455e9e044e997753c93d Merge: d5dd500e3 0a60a94a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 94871f75d7629bede0a028446865f6ca53b47bd3 Merge: 02e1e8a51 209332e71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.3] SKIP test_key_expiration.sh on Windows until the underlying issue is resolved
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 449d190e2e447937893d228e63292512c06cb531 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 18 12:37:12 2018 +1000 SKIP test_key_expiration.sh on Windows until the underlying issue is resolved 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. --- changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug26853 b/changes/bug26853 new file mode 100644 index 000000000..6ee47789b --- /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 5511dbf18..cf6608634 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

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 209332e71ab5a7633ee0c934be017740f3e9552a Merge: 312a42fc8 449d190e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:30:59 2018 -0400 Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 209332e71ab5a7633ee0c934be017740f3e9552a Merge: 312a42fc8 449d190e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:30:59 2018 -0400 Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 852155bb62df0d30811147c3506d19bf80647eda Merge: 24ac72877 0a60a94a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.4] SKIP test_key_expiration.sh on Windows until the underlying issue is resolved
by nickm＠torproject.org 19 Jul '18

19 Jul '18

commit 449d190e2e447937893d228e63292512c06cb531 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 18 12:37:12 2018 +1000 SKIP test_key_expiration.sh on Windows until the underlying issue is resolved 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. --- changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug26853 b/changes/bug26853 new file mode 100644 index 000000000..6ee47789b --- /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 5511dbf18..cf6608634 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

1 0