Commit d30a042f authored by teor's avatar teor
Browse files

test: Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes 

In the unit tests and fuzzers.

Fixes bug 31334; bugfix on 0.2.5.2-alpha.
parent 1ad1e84b

changes/bug31334

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Code simplification and refactoring:

    - Use SEVERITY_MASK_IDX() to find the LOG_* mask indexes in the unit

      tests and fuzzers, rather than using hard-coded values.

      Closes ticket 31334.

src/test/fuzz/fuzzing_common.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ main(int argc, char **argv) 
    memset(&s, 0, sizeof(s));

    set_log_severity_config(loglevel, LOG_ERR, &s);

    /* ALWAYS log bug warnings. */

    s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;

    s.masks[SEVERITY_MASK_IDX(LOG_WARN)] |= LD_BUG;

    add_stream_log(&s, "", fileno(stdout));

  }

src/test/test_logging.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ test_get_sigsafe_err_fds(void *arg) 


  set_log_severity_config(LOG_WARN, LOG_ERR, &include_bug);

  set_log_severity_config(LOG_WARN, LOG_ERR, &no_bug);

  no_bug.masks[0] &= ~(LD_BUG|LD_GENERAL);

  no_bug.masks[SEVERITY_MASK_IDX(LOG_ERR)] &= ~(LD_BUG|LD_GENERAL);

  set_log_severity_config(LOG_INFO, LOG_NOTICE, &no_bug2);



  /* Add some logs; make sure the output is as expected. */

src/test/test_options.c

+3 −3
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ setup_log_callback(void) 
{

  log_severity_list_t lst;

  memset(&lst, 0, sizeof(lst));

  lst.masks[LOG_ERR - LOG_ERR] = ~0;

  lst.masks[LOG_WARN - LOG_ERR] = ~0;

  lst.masks[LOG_NOTICE - LOG_ERR] = ~0;

  lst.masks[SEVERITY_MASK_IDX(LOG_ERR)] = ~0;

  lst.masks[SEVERITY_MASK_IDX(LOG_WARN)] = ~0;

  lst.masks[SEVERITY_MASK_IDX(LOG_NOTICE)] = ~0;

  add_callback_log(&lst, log_cback);

  mark_logs_temp();

}

src/test/testing_common.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ main(int c, const char **v) 
    memset(&s, 0, sizeof(s));

    set_log_severity_config(loglevel, LOG_ERR, &s);

    /* ALWAYS log bug warnings. */

    s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;

    s.masks[SEVERITY_MASK_IDX(LOG_WARN)] |= LD_BUG;

    add_stream_log(&s, "", fileno(stdout));

  }

  {
@@ -303,7 +303,7 @@ main(int c, const char **v) 
    log_severity_list_t s;

    memset(&s, 0, sizeof(s));

    set_log_severity_config(LOG_ERR, LOG_ERR, &s);

    s.masks[LOG_WARN-LOG_ERR] |= LD_BUG;

    s.masks[SEVERITY_MASK_IDX(LOG_WARN)] |= LD_BUG;

    add_callback_log(&s, log_callback_failure);

  }

  flush_log_messages_from_startup();