Merge commit 'cae5979871ee7aa341334f8b1af6bafc60ee9692' into tmp-bad-learn

3 files changed, 26 insertions, 11 deletions

diff --git a/test/birdtest.c b/test/birdtest.c
index c6a09684..ae05d1a5 100644
--- a/test/birdtest.c
+++ b/test/birdtest.c
@@ -20,6 +20,7 @@
 
 #include "test/birdtest.h"
 #include "lib/string.h"
+#include "lib/event.h"
 
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
@@ -58,14 +59,11 @@ u64 bt_random_state[] = {
   0x53d9772877c1b647, 0xab8ce3eb466de6c5, 0xad02844c8a8e865f, 0xe8cc78080295065d
 };
 
-void resource_sys_init(void);
-
 void
 bt_init(int argc, char *argv[])
 {
   int c;
 
-  resource_sys_init();
   initstate(BT_RANDOM_SEED, (char *) bt_random_state, sizeof(bt_random_state));
 
   bt_verbose = 0;
@@ -122,6 +120,9 @@ bt_init(int argc, char *argv[])
   clock_gettime(CLOCK_MONOTONIC, &bt_begin);
   bt_suite_case_begin = bt_suite_begin = bt_begin;
 
+  resource_init();
+  ev_init_list(&global_event_list);
+
   return;
 
  usage:
@@ -175,6 +176,8 @@ int bt_run_test_fn(int (*fn)(const void *), const void *fn_arg, int timeout)
   if (!bt_suite_result)
     result = 0;
 
+  tmp_flush();
+
   return result;
 }
 
@@ -312,6 +315,12 @@ bt_log_suite_case_result(int result, const char *fmt, ...)
   }
 }
 
+void
+bt_reset_suite_case_timer(void)
+{
+  clock_gettime(CLOCK_MONOTONIC, &bt_suite_case_begin);
+}
+
 int
 bt_test_suite_base(int (*fn)(const void *), const char *id, const void *fn_arg, int forked, int timeout, const char *dsc, ...)
 {
@@ -504,6 +513,15 @@ bt_fmt_ipa(char *buf, size_t size, const void *data)
     bsnprintf(buf, size, "(null)");
 }
 
+void
+bt_format_net(char *buf, size_t size, const void *data)
+{
+  if (data)
+    bsnprintf(buf, size, "%N", (const net_addr *) data);
+  else
+    bsnprintf(buf, size, "(null)");
+}
+
 int
 bt_is_char(byte c)
 {
diff --git a/test/birdtest.h b/test/birdtest.h
index caec529b..ad5f8f9c 100644
--- a/test/birdtest.h
+++ b/test/birdtest.h
@@ -32,6 +32,7 @@ extern const char *bt_test_id;
 
 void bt_init(int argc, char *argv[]);
 int  bt_exit_value(void);
+void bt_reset_suite_case_timer(void);
 int bt_test_suite_base(int (*test_fn)(const void *), const char *test_id, const void *test_fn_argument, int forked, int timeout, const char *dsc, ...);
 static inline u64 bt_random(void)
 { return ((u64) random() & 0xffffffff) | ((u64) random() << 32); }
@@ -165,6 +166,8 @@ struct bt_batch {
 void bt_fmt_str(char *buf, size_t size, const void *data);
 void bt_fmt_unsigned(char *buf, size_t size, const void *data);
 void bt_fmt_ipa(char *buf, size_t size, const void *data);
+void bt_format_net(char *buf, size_t size, const void *data);
+
 int bt_assert_batch__(struct bt_batch *opts);
 int bt_is_char(byte c);
 
diff --git a/test/bt-utils.c b/test/bt-utils.c
index cbca3a6b..509b5ed4 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -14,7 +14,7 @@
 #include "test/bt-utils.h"
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 
 #include "sysdep/unix/unix.h"
@@ -60,24 +60,18 @@ bt_bird_init(void)
     log_init_debug("");
   log_switch(bt_verbose != 0, NULL, NULL);
 
-  resource_init();
   olock_init();
   timer_init();
-  io_init();
   rt_init();
+  io_init();
   if_init();
   config_init();
 
   protos_build();
-  proto_build(&proto_unix_kernel);
-  proto_build(&proto_unix_iface);
 }
 
 void bt_bird_cleanup(void)
 {
-  for (int i = 0; i < PROTOCOL__MAX; i++)
-    class_to_protocol[i] = NULL;
-
   config = new_config = NULL;
 }