From: Maria Matejka <mq@ucw.cz>
Date: Mon, 1 Aug 2022 13:17:41 +0000 (+0200)
Subject: Fixed main birdloop init in unit tests
X-Git-Tag: v3.0-alpha1~171^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1d6c66a78758449f00ed709891e24ab3571cc9c;p=thirdparty%2Fbird.git

Fixed main birdloop init in unit tests

Some unit tests weren't initializing the birdloop, trying to write the
birdloop ping into stdin. Fixed this and also forced stdin close on
startup of every test just to be sure that CI and local build behave the
same in this. (CI was failing on this while local build not.)
---

diff --git a/lib/event_test.c b/lib/event_test.c
index 5385011a8..612deb25c 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 2ae7b51e5..5e3de1c56 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 3d56292ee..36e44da4e 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();