From 23f5fb667c5a17deb5ce99fcedc903410d68b8fe Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Wed, 6 Nov 2019 12:21:46 +0000 Subject: [PATCH] test/rib: speed up rib autotests Split slow part of rib_autotest into rib_slow_autotest Fixes: b35df4dd666e ("test/rib: add autotests") Signed-off-by: Vladimir Medvedkin Acked-by: Aaron Conole --- app/test/autotest_data.py | 6 ++++++ app/test/meson.build | 1 + app/test/test_rib.c | 20 ++++++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index e89707e60d..ab150db42e 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -116,6 +116,12 @@ parallel_test_list = [ "Func": default_autotest, "Report": None, }, + { + "Name": "RIB slow autotest", + "Command": "rib_slow_autotest", + "Func": default_autotest, + "Report": None, + }, { "Name": "RIB6 autotest", "Command": "rib6_autotest", diff --git a/app/test/meson.build b/app/test/meson.build index 37ab9d2240..8847d5a1ea 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -259,6 +259,7 @@ perf_test_names = [ 'reciprocal_division', 'reciprocal_division_perf', 'lpm_perf_autotest', + 'rib_slow_autotest', 'fib_slow_autotest', 'fib_perf_autotest', 'red_all', diff --git a/app/test/test_rib.c b/app/test/test_rib.c index c95957a474..3dc48fe1f2 100644 --- a/app/test/test_rib.c +++ b/app/test/test_rib.c @@ -76,7 +76,7 @@ test_multiple_create(void) config.ext_sz = 0; - for (i = 0; i < 10; i++) { + for (i = 0; i < 100; i++) { config.max_nodes = MAX_RULES - i; rib = rte_rib_create(__func__, SOCKET_ID_ANY, &config); RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n"); @@ -329,7 +329,6 @@ static struct unit_test_suite rib_tests = { .teardown = NULL, .unit_test_cases = { TEST_CASE(test_create_invalid), - TEST_CASE(test_multiple_create), TEST_CASE(test_free_null), TEST_CASE(test_insert_invalid), TEST_CASE(test_get_fn), @@ -339,6 +338,16 @@ static struct unit_test_suite rib_tests = { } }; +static struct unit_test_suite rib_slow_tests = { + .suite_name = "rib slow autotest", + .setup = NULL, + .teardown = NULL, + .unit_test_cases = { + TEST_CASE(test_multiple_create), + TEST_CASES_END() + } +}; + /* * Do all unit tests. */ @@ -348,4 +357,11 @@ test_rib(void) return unit_test_suite_runner(&rib_tests); } +static int +test_slow_rib(void) +{ + return unit_test_suite_runner(&rib_slow_tests); +} + REGISTER_TEST_COMMAND(rib_autotest, test_rib); +REGISTER_TEST_COMMAND(rib_slow_autotest, test_slow_rib); -- 2.20.1