Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / tests / lib / cli / common_cli.c

diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 44cc6efe8427cd8fac1f4636a1bd6609675e125f..29dad7d80f61600459962fccd1961edbbda7e6b6 100644 (file)
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -1,22 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * generic CLI test helper functions
  *
  * Copyright (C) 2015 by David Lamparter,
  *                   for Open Source Routing / NetDEF, Inc.
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -59,10 +46,14 @@ static void vty_do_exit(int isexit)
                exit(0);
 }
 
+const struct frr_yang_module_info *const *test_yang_modules = NULL;
+int test_log_prio = ZLOG_DISABLED;
+
 /* main routine. */
 int main(int argc, char **argv)
 {
        struct thread thread;
+       size_t yangcount;
 
        /* Set umask before anything for security */
        umask(0027);
@@ -70,7 +61,7 @@ int main(int argc, char **argv)
        /* master init. */
        master = thread_master_create(NULL);
 
-       zlog_aux_init("NONE: ", ZLOG_DISABLED);
+       zlog_aux_init("NONE: ", test_log_prio);
 
        /* Library inits. */
        cmd_init(1);
@@ -79,8 +70,11 @@ int main(int argc, char **argv)
 
        vty_init(master, false);
        lib_cmd_init();
-       yang_init(true);
-       nb_init(master, NULL, 0, false);
+
+       for (yangcount = 0; test_yang_modules && test_yang_modules[yangcount];
+            yangcount++)
+               ;
+       nb_init(master, test_yang_modules, yangcount, false);
 
        test_init(argc, argv);