- tor-commits - lists.torproject.org

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 46ad2240de54f4d4499542b1dfe769378555ad65 Merge: d1c781e67e 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/main] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/maint-0.4.5] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/maint-0.4.6] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/release-0.4.5] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/release-0.4.6] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 80d33e10aa5b4537c7dbc051b3b4e7ae3570aa12 Merge: 86aec2abf3 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 46ad2240de54f4d4499542b1dfe769378555ad65 Merge: d1c781e67e 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 1f76b3cce7c8aaaf08ae1a35799b5b366c7dfaf4 Merge: dafed93ccd 46ad2240de Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.6' into release-0.4.6 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 46ad2240de54f4d4499542b1dfe769378555ad65 Merge: d1c781e67e 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0