- Allocate buffer large enough to contain UNIX_PATH_MAX size pathnames in case of...

[oweals/gnunet.git] / src / util / test_common_logging_runtime_loglevels.c

diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index c608d59c59b220541059f63389c7ef7f1325b358..3361ca1b10fbc0f663780ff665539697ccb91b31 100644 (file)
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -30,15 +30,15 @@
 
 /**
  * How much time the child is allowed to waste on skipped log calls, at most.
- * Raspberry Pi takes 33 microseconds tops, this is 3x that value.
+ * Raspberry Pi takes 113 microseconds tops, this is 3x that value.
  */
-#define MAX_SKIP_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 100).rel_value_us
+#define MAX_SKIP_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 400).rel_value_us
 
 /**
  * How much time non-skipped log call should take, at least.
  * Keep in sync with the value in the dummy!
  */
-#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 200).rel_value_us
+#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 1000).rel_value_us
 
 static int ok;
 
@@ -64,7 +64,7 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
               ok);
   if (NULL != proc)
   {
-    if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+    if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
     }
@@ -96,7 +96,7 @@ end_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static char *
 read_output_line (int phase_from1, int phase_to1, int phase_from2,
                   int phase_to2, char c, const char *expect_level,
-                  long delay_morethan, long delay_lessthan, int phase, 
+                  long delay_morethan, long delay_lessthan, int phase,
                  char *p,
                   int *len, long *delay, char level[8])
 {
@@ -175,7 +175,7 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
   /* Delay must be either less than 'lessthan' (log call is skipped)
    * or more than 'morethan' (log call is not skipped)
    */
-  delay_outside_of_range = ((*delay < delay_lessthan) || (*delay > delay_morethan));
+  delay_outside_of_range = ((*delay < delay_lessthan) || (*delay >= delay_morethan));
   if (delay_is_a_dummy)
     delay_outside_of_range = 1;