Removed config reparsing from unrelated tests

3 files changed, 4 insertions, 50 deletions

diff --git a/filter/filter_test.c b/filter/filter_test.c
index 671dba94..aa325aef 100644
--- a/filter/filter_test.c
+++ b/filter/filter_test.c
@@ -85,6 +85,5 @@ main(int argc, char *argv[])
   WALK_LIST(t, config->tests)
     bt_test_suite_base(run_function, t->fn_name, t, 0, BT_TIMEOUT, "%s", t->dsc);
 
-  bt_bird_cleanup();
   return bt_exit_value();
 }
diff --git a/filter/tree_test.c b/filter/tree_test.c
index d180efbc..655205c2 100644
--- a/filter/tree_test.c
+++ b/filter/tree_test.c
@@ -15,13 +15,6 @@
 
 #define MAX_TREE_HEIGHT 13
 
-static void
-start_conf_env(void)
-{
-  bt_bird_init();
-  cfg_mem = tmp_linpool;
-}
-
 static struct f_tree *
 new_tree(uint id)
 {
@@ -153,8 +146,6 @@ get_balanced_tree_with_ranged_values(uint nodes_count)
 static int
 t_balancing(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -181,8 +172,6 @@ t_balancing(void)
 static int
 t_balancing_random(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -218,8 +207,6 @@ t_balancing_random(void)
 static int
 t_find(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -266,8 +253,6 @@ get_max_value_in_unbalanced_tree(struct f_tree *node, uint max)
 static int
 t_find_ranges(void)
 {
-  start_conf_env();
-
   uint height;
   for (height = 1; height < MAX_TREE_HEIGHT; height++)
   {
@@ -305,6 +290,8 @@ int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  bt_bird_init();
+  cfg_mem = tmp_linpool;
 
   bt_test_suite(t_balancing, "Balancing strong unbalanced trees");
   bt_test_suite(t_balancing_random, "Balancing random unbalanced trees");
diff --git a/filter/trie_test.c b/filter/trie_test.c
index ddce2daa..81f38db9 100644
--- a/filter/trie_test.c
+++ b/filter/trie_test.c
@@ -432,9 +432,6 @@ test_match_net(list *prefixes, struct f_trie *trie, const net_addr *net)
 static int
 t_match_random_net(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM; round++)
   {
@@ -452,16 +449,12 @@ t_match_random_net(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
 static int
 t_match_inner_net(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM; round++)
   {
@@ -482,16 +475,12 @@ t_match_inner_net(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
 static int
 t_match_outer_net(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM; round++)
   {
@@ -513,7 +502,6 @@ t_match_outer_net(void)
   }
 
   v6 = !v6;
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -574,34 +562,24 @@ benchmark_trie_dataset(const char *filename, int plus)
 static int UNUSED
 t_bench_trie_datasets_subset(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   /* Specific datasets, not included */
   benchmark_trie_dataset("trie-data-bgp-1", 0);
   benchmark_trie_dataset("trie-data-bgp-10", 0);
   benchmark_trie_dataset("trie-data-bgp-100", 0);
   benchmark_trie_dataset("trie-data-bgp-1000", 0);
 
-  bt_bird_cleanup();
-
   return 1;
 }
 
 static int UNUSED
 t_bench_trie_datasets_random(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   /* Specific datasets, not included */
   benchmark_trie_dataset("trie-data-bgp-1", 1);
   benchmark_trie_dataset("trie-data-bgp-10", 1);
   benchmark_trie_dataset("trie-data-bgp-100", 1);
   benchmark_trie_dataset("trie-data-bgp-1000", 1);
 
-  bt_bird_cleanup();
-
   return 1;
 }
 
@@ -609,9 +587,6 @@ t_bench_trie_datasets_random(void)
 static int
 t_trie_same(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   int v6 = 0;
   for (int round = 0; round < TESTS_NUM*4; round++)
   {
@@ -632,7 +607,6 @@ t_trie_same(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -652,9 +626,6 @@ log_networks(const net_addr *a, const net_addr *b)
 static int
 t_trie_walk(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   for (int round = 0; round < TESTS_NUM*8; round++)
   {
     int level = round / TESTS_NUM;
@@ -763,7 +734,6 @@ t_trie_walk(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -802,9 +772,6 @@ find_covering_nets(struct f_prefix *prefixes, int num, const net_addr *net, net_
 static int
 t_trie_walk_to_root(void)
 {
-  bt_bird_init();
-  bt_config_parse(BT_CONFIG_SIMPLE);
-
   for (int round = 0; round < TESTS_NUM * 4; round++)
   {
     int level = round / TESTS_NUM;
@@ -876,7 +843,6 @@ t_trie_walk_to_root(void)
     tmp_flush();
   }
 
-  bt_bird_cleanup();
   return 1;
 }
 
@@ -884,6 +850,8 @@ int
 main(int argc, char *argv[])
 {
   bt_init(argc, argv);
+  bt_bird_init();
+  bt_config_parse(BT_CONFIG_SIMPLE);
 
   bt_test_suite(t_match_random_net, "Testing random prefix matching");
   bt_test_suite(t_match_inner_net, "Testing random inner prefix matching");