diff options
| -rw-r--r-- | lib/event_test.c | 3 | ||||
| -rw-r--r-- | test/birdtest.c | 5 | ||||
| -rw-r--r-- | test/bt-utils.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/event_test.c b/lib/event_test.c index 5385011a..612deb25 100644 --- a/lib/event_test.c +++ b/lib/event_test.c @@ -54,7 +54,6 @@ t_ev_run_list(void) int i; olock_init(); - birdloop_init(); rt_init(); io_init(); if_init(); @@ -81,9 +80,7 @@ main(int argc, char *argv[]) { bt_init(argc, argv); - the_bird_lock(); bt_test_suite(t_ev_run_list, "Schedule and run 3 events in right order."); - the_bird_unlock(); return bt_exit_value(); } diff --git a/test/birdtest.c b/test/birdtest.c index 2ae7b51e..5e3de1c5 100644 --- a/test/birdtest.c +++ b/test/birdtest.c @@ -65,6 +65,9 @@ bt_init(int argc, char *argv[]) { int c; + /* We have no interest in stdin */ + close(0); + initstate(BT_RANDOM_SEED, (char *) bt_random_state, sizeof(bt_random_state)); bt_verbose = 0; @@ -121,9 +124,11 @@ bt_init(int argc, char *argv[]) clock_gettime(CLOCK_MONOTONIC, &bt_begin); bt_suite_case_begin = bt_suite_begin = bt_begin; + the_bird_lock(); resource_init(); 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"); + birdloop_init(); return; usage: diff --git a/test/bt-utils.c b/test/bt-utils.c index 3d56292e..36e44da4 100644 --- a/test/bt-utils.c +++ b/test/bt-utils.c @@ -62,9 +62,7 @@ bt_bird_init(void) log_init_debug(""); log_switch(bt_verbose != 0, NULL, NULL); - the_bird_lock(); olock_init(); - birdloop_init(); rt_init(); io_init(); if_init(); |