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

[tor/master] Merge branch 'ticket27547_035_01_squashed'
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit db27a70c9450495974ad0f2f5ee8c4d7454293f8 Merge: d44eb16b2 e7ab20710 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:48:13 2018 -0400 Merge branch 'ticket27547_035_01_squashed' changes/ticket27547 | 7 +++++++ doc/tor.1.txt | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)

1 0

[tor/release-0.3.4] Check waitpid return value and exit status in tinytest.c
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 73a37d1e547d996515e2a0ffea8331bb535d2841 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:57:18 2018 -0400 Check waitpid return value and exit status in tinytest.c It's possible for a unit test to report success via its pipe, but to fail as it tries to clean up and exit. Notably, this happens on a leak sanitizer failure. Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was introduced. --- changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug27658 b/changes/bug27658 new file mode 100644 index 000000000..8cc0aa471 --- /dev/null +++ b/changes/bug27658 @@ -0,0 +1,6 @@ + o Minor bugfixes (testing): + - If a unit test running in a subprocess exits abnormally or with a + nonzero status code, treat the test as having failed, even if + the test reported success. Without this fix, memory leaks don't cause + cause the tests to fail, even with LeakSanitizer. Fixes bug 27658; + bugfix on 0.2.2.4-alpha. diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c index 3fb1b39c7..a51cd6011 100644 --- a/src/ext/tinytest.c +++ b/src/ext/tinytest.c @@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group, r = (int)read(outcome_pipe[0], b, 1); if (r == 0) { printf("[Lost connection!] "); - return 0; + return FAIL; } else if (r != 1) { perror("read outcome from pipe"); } - waitpid(pid, &status, 0); + r = waitpid(pid, &status, 0); close(outcome_pipe[0]); + if (r == -1) { + perror("waitpid"); + return FAIL; + } + if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) { + printf("[did not exit cleanly.]"); + return FAIL; + } return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL); } #endif

1 0

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

13 Sep '18

commit 9697c2da4680267038d407093cbcbc4c68059904 Merge: 5a8827a4c c02f2d9eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e Merge: f8d5fb42a 825342825 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 5e94c9384197f75b6007e3de1c833912fe8ecb6a Merge: 04f210811 3ddfd5ff2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug27658_029' into maint-0.2.9
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit c02f2d9eb45786c552dcc33c102e9964d95f66c1 Merge: 198b6354e 73a37d1e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:45:58 2018 -0400 Merge branch 'bug27658_029' into maint-0.2.9 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 8253428253109dabc35861cbaab23a44a22eb24d Merge: 4fa46fca8 9697c2da4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 9697c2da4680267038d407093cbcbc4c68059904 Merge: 5a8827a4c c02f2d9eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:46:04 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.2] Check waitpid return value and exit status in tinytest.c
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 73a37d1e547d996515e2a0ffea8331bb535d2841 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 08:57:18 2018 -0400 Check waitpid return value and exit status in tinytest.c It's possible for a unit test to report success via its pipe, but to fail as it tries to clean up and exit. Notably, this happens on a leak sanitizer failure. Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was introduced. --- changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug27658 b/changes/bug27658 new file mode 100644 index 000000000..8cc0aa471 --- /dev/null +++ b/changes/bug27658 @@ -0,0 +1,6 @@ + o Minor bugfixes (testing): + - If a unit test running in a subprocess exits abnormally or with a + nonzero status code, treat the test as having failed, even if + the test reported success. Without this fix, memory leaks don't cause + cause the tests to fail, even with LeakSanitizer. Fixes bug 27658; + bugfix on 0.2.2.4-alpha. diff --git a/src/ext/tinytest.c b/src/ext/tinytest.c index 3fb1b39c7..a51cd6011 100644 --- a/src/ext/tinytest.c +++ b/src/ext/tinytest.c @@ -207,12 +207,20 @@ testcase_run_forked_(const struct testgroup_t *group, r = (int)read(outcome_pipe[0], b, 1); if (r == 0) { printf("[Lost connection!] "); - return 0; + return FAIL; } else if (r != 1) { perror("read outcome from pipe"); } - waitpid(pid, &status, 0); + r = waitpid(pid, &status, 0); close(outcome_pipe[0]); + if (r == -1) { + perror("waitpid"); + return FAIL; + } + if (! WIFEXITED(status) || WEXITSTATUS(status) != 0) { + printf("[did not exit cleanly.]"); + return FAIL; + } return b[0]=='Y' ? OK : (b[0]=='S' ? SKIP : FAIL); } #endif

1 0

[tor/maint-0.3.2] Merge branch 'bug27658_029' into maint-0.2.9
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit c02f2d9eb45786c552dcc33c102e9964d95f66c1 Merge: 198b6354e 73a37d1e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:45:58 2018 -0400 Merge branch 'bug27658_029' into maint-0.2.9 changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0