[tor-commits] [tor/master] Merge branch 'bug32175'

[nickm at torproject.org]

commit a1d53413742840f4dab499531cb29a9d74c51b8a
Merge: 65e80ce64 cb13930f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 07:51:30 2019 -0400

    Merge branch 'bug32175'

 changes/bug32175        |   6 +
 src/app/config/config.c |   4 +
 src/test/test_options.c | 793 ++++++++++++++++--------------------------------
 3 files changed, 265 insertions(+), 538 deletions(-)

diff --cc src/test/test_options.c
index 8885ecfdd,1f5c85b40..82def205a
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@@ -679,9 -650,10 +651,9 @@@ test_options_validate__logs(void *ignor
    tdata->opt->RunAsDaemon = 0;
  
    ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
 -  tt_str_op(tdata->opt->Logs->key, OP_EQ, "Log");
 -  tt_str_op(tdata->opt->Logs->value, OP_EQ, "notice stdout");
 +  tt_assert(!tdata->opt->Logs);
    tor_free(msg);
-   tt_int_op(ret, OP_EQ, -1);
+   tt_int_op(ret, OP_EQ, 0);
  
    free_options_test_data(tdata);
    tdata = get_options_test_data("");
@@@ -689,9 -661,10 +661,9 @@@
    tdata->opt->RunAsDaemon = 0;
    quiet_level = 1;
    ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
 -  tt_str_op(tdata->opt->Logs->key, OP_EQ, "Log");
 -  tt_str_op(tdata->opt->Logs->value, OP_EQ, "warn stdout");
 +  tt_assert(!tdata->opt->Logs);
    tor_free(msg);
-   tt_int_op(ret, OP_EQ, -1);
+   tt_int_op(ret, OP_EQ, 0);
  
    free_options_test_data(tdata);
    tdata = get_options_test_data("");