summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-07-18 12:33:00 +0200
committerMaria Matejka <mq@ucw.cz>2022-07-18 12:33:00 +0200
commit08c84846089a131a0e7e9e0185b6c6ccb4ed4e2d (patch)
treebcf82552565dcdb0c5e722a0bb837b1e948ed955 /test
parent4b6f5ee8709b2fae9da13c58bfbae21b84cd40c5 (diff)
parent94eb0858c2b938549d9d1703c872c6149901e7dd (diff)
Merge commit '94eb0858' into thread-next
Diffstat (limited to 'test')
-rw-r--r--test/birdtest.c5
-rw-r--r--test/bt-utils.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/test/birdtest.c b/test/birdtest.c
index ae05d1a5..2ae7b51e 100644
--- a/test/birdtest.c
+++ b/test/birdtest.c
@@ -21,6 +21,7 @@
#include "test/birdtest.h"
#include "lib/string.h"
#include "lib/event.h"
+#include "lib/io-loop.h"
#ifdef HAVE_EXECINFO_H
#include <execinfo.h>
@@ -121,8 +122,8 @@ bt_init(int argc, char *argv[])
bt_suite_case_begin = bt_suite_begin = bt_begin;
resource_init();
- ev_init_list(&global_event_list);
-
+ ev_init_list(&global_event_list, &main_birdloop, "Global event list in unit tests");
+ ev_init_list(&global_work_list, &main_birdloop, "Global work list in unit tests");
return;
usage:
diff --git a/test/bt-utils.c b/test/bt-utils.c
index 509b5ed4..3d56292e 100644
--- a/test/bt-utils.c
+++ b/test/bt-utils.c
@@ -53,6 +53,8 @@ cf_file_read(byte *dest, uint max_len, int fd)
return l;
}
+void resource_sys_init(void);
+
void
bt_bird_init(void)
{
@@ -60,8 +62,9 @@ bt_bird_init(void)
log_init_debug("");
log_switch(bt_verbose != 0, NULL, NULL);
+ the_bird_lock();
olock_init();
- timer_init();
+ birdloop_init();
rt_init();
io_init();
if_init();
@@ -73,6 +76,7 @@ bt_bird_init(void)
void bt_bird_cleanup(void)
{
config = new_config = NULL;
+ the_bird_unlock();
}
static char *