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

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

17 Jul '18

commit 12afdcc15a8429bcc50d9287321849b6fa924c2f Merge: 6fd301fa8 304ee896d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

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

17 Jul '18

commit 6dafddd05dcbf65626d7cff2250955d8799e975d Author: teor <teor2345(a)gmail.com> Date: Tue Jul 17 11:24:02 2018 +1000 SKIP test_keygen.sh on Windows until the underlying issue is resolved 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. --- changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug26830 b/changes/bug26830 new file mode 100644 index 000000000..c002f1953 --- /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 87012cd28..4106425cb 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

1 0

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

17 Jul '18

commit 6dafddd05dcbf65626d7cff2250955d8799e975d Author: teor <teor2345(a)gmail.com> Date: Tue Jul 17 11:24:02 2018 +1000 SKIP test_keygen.sh on Windows until the underlying issue is resolved 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. --- changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug26830 b/changes/bug26830 new file mode 100644 index 000000000..c002f1953 --- /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 87012cd28..4106425cb 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

1 0

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

17 Jul '18

commit 499612420495da4a41b169d5478c19a8e80280d2 Merge: ea2103812 6dafddd05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

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

17 Jul '18

commit 61a2762e353f29b8b4402bf068e6268809174702 Merge: 98ee23ca1 6dafddd05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

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

17 Jul '18

commit 6dafddd05dcbf65626d7cff2250955d8799e975d Author: teor <teor2345(a)gmail.com> Date: Tue Jul 17 11:24:02 2018 +1000 SKIP test_keygen.sh on Windows until the underlying issue is resolved 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. --- changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug26830 b/changes/bug26830 new file mode 100644 index 000000000..c002f1953 --- /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 87012cd28..4106425cb 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

1 0

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

17 Jul '18

commit 8a49a44111e239aa1d2d0aa142ab1ae994715a56 Merge: 8747627d8 61a2762e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26830 | 3 +++ src/test/test_keygen.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 17 Jul '18

17 Jul '18

commit 1440c4598ce1ba26d80d6f078ba5a76bca7677fa Merge: 9e6f21c74 28d1057d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

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

17 Jul '18

commit 6dafddd05dcbf65626d7cff2250955d8799e975d Author: teor <teor2345(a)gmail.com> Date: Tue Jul 17 11:24:02 2018 +1000 SKIP test_keygen.sh on Windows until the underlying issue is resolved 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. --- changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug26830 b/changes/bug26830 new file mode 100644 index 000000000..c002f1953 --- /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 87012cd28..4106425cb 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

1 0

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

17 Jul '18

commit 61a2762e353f29b8b4402bf068e6268809174702 Merge: 98ee23ca1 6dafddd05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0