diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-05-06 14:52:12 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-05-06 14:52:12 +0000 |
| commit | 34aad61f423d2f6078ecfe51cb7a650fe528ab96 (patch) | |
| tree | eb9cb60dfec80175d3102afc52e671622fc723f4 | |
| parent | e8cf81fdb3fdaef59b49da8f6e952a3225ab326e (diff) | |
fix ftbfs
| -rw-r--r-- | src/jsonapi/Makefile.am | 1 | ||||
| -rw-r--r-- | src/util/test_common_logging_runtime_loglevels.c | 22 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/jsonapi/Makefile.am b/src/jsonapi/Makefile.am index 22ae7dac51..f190d3e093 100644 --- a/src/jsonapi/Makefile.am +++ b/src/jsonapi/Makefile.am @@ -45,5 +45,6 @@ test_jsonapi_SOURCES = \ test_jsonapi.c test_jsonapi_LDADD = \ libgnunetjsonapi.la \ + $(top_builddir)/src/json/libgnunetjson.la \ $(top_builddir)/src/util/libgnunetutil.la \ -ljansson diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index 033b16ce1f..c633d7de89 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c @@ -179,16 +179,22 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2, if (delay_is_a_dummy) delay_outside_of_range = 1; - if (!stop) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log format?\n"); - if (!level_matches) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log level\n"); - if (!delay_is_sane) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Delay %ld is insane\n", *delay); - if (!delay_outside_of_range) + if (! stop) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Wrong log format?\n"); + if (! level_matches) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Wrong log level\n"); + if (! delay_is_sane) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Delay %ld is insane\n", + *delay); + if (! delay_outside_of_range) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Delay %ld is not outside of range (%ld ; %ld)\n", - *delay, delay_lessthan, delay_morethan, c); + *delay, + delay_lessthan, + delay_morethan); if (!stop || !level_matches || !delay_is_sane || !delay_outside_of_range) return NULL; *len = *len - i; |