From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2B3E2A0548; Fri, 2 Apr 2021 16:24:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E862140FF7; Fri, 2 Apr 2021 16:24:48 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id DF94A140FE6 for ; Fri, 2 Apr 2021 16:24:45 +0200 (CEST) IronPort-SDR: M6wVoYmFB86dLrv4Y7TZSZFeVh7w+xym+1hJy3v7c99A91bnHzX0Z8bYKuxbKPe2wVRu+O1iD1 2BykN5woLfZA== X-IronPort-AV: E=McAfee;i="6000,8403,9942"; a="192512452" X-IronPort-AV: E=Sophos;i="5.81,300,1610438400"; d="scan'208";a="192512452" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2021 07:24:45 -0700 IronPort-SDR: sYic2JVRYxlz+50py3xDyrNl3rEEduQhkvlKqk3jsPw/k2RHFQYP2JH5oc3G49vQguOgDEd03F WXyGMw4h/NtA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,300,1610438400"; d="scan'208";a="413199574" Received: from silpixa00400355.ir.intel.com (HELO silpixa00400355.ger.corp.intel.com) ([10.237.223.148]) by fmsmga008.fm.intel.com with ESMTP; 02 Apr 2021 07:24:43 -0700 From: Ciara Power To: dev@dpdk.org Cc: declan.doherty@intel.com, gakhil@marvell.com, aconole@redhat.com, hemant.agrawal@nxp.com, anoobj@marvell.com, ruifeng.wang@arm.com, asomalap@amd.com, ajit.khaparde@broadcom.com, g.singh@nxp.com, Ciara Power Date: Fri, 2 Apr 2021 14:24:20 +0000 Message-Id: <20210402142424.1353789-3-ciara.power@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210402142424.1353789-1-ciara.power@intel.com> References: <20210402142424.1353789-1-ciara.power@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 2/6] test: introduce parent testsuite format X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The current structure for unit testing only allows for running a test suite with nested test cases. This means all test cases for an autotest must be in one suite, which is not ideal. For example, in some cases we may want to run multiple lists of test cases that each require different setup, so should be in separate suites. The unit test suite struct is modified to hold a pointer to a list of sub-testsuite pointers, along with the list of testcases as before. Both should not be used at once, if there are sub-testsuite pointers, that takes precedence over testcases. Signed-off-by: Ciara Power --- v2: - Added macro to loop sub-testsuites. - Added sub-testsuite summary detail. --- app/test/test.c | 168 ++++++++++++++++++++++++++++++++++-------------- app/test/test.h | 1 + 2 files changed, 122 insertions(+), 47 deletions(-) diff --git a/app/test/test.c b/app/test/test.c index a795cba1bb..e401de0fdf 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -41,6 +41,11 @@ extern cmdline_parse_ctx_t main_ctx[]; suite->unit_test_cases[iter].testcase; \ iter++, case = suite->unit_test_cases[iter]) +#define FOR_EACH_SUITE_TESTSUITE(iter, suite, sub_ts) \ + for (iter = 0, sub_ts = suite->unit_test_suites[0]; \ + suite->unit_test_suites[iter]->suite_name != NULL; \ + iter++, sub_ts = suite->unit_test_suites[iter]) + const char *prgname; /* to be set to argv[0] */ static const char *recursive_call; /* used in linux for MP and other tests */ @@ -214,21 +219,46 @@ main(int argc, char **argv) static void unit_test_suite_count_tcs_on_setup_fail(struct unit_test_suite *suite, - int test_success) + int test_success, unsigned int *sub_ts_failed, + unsigned int *sub_ts_skipped, unsigned int *sub_ts_total) { struct unit_test_case tc; - - FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) { - if (!tc.enabled || test_success == TEST_SKIPPED) - suite->skipped++; - else - suite->failed++; + struct unit_test_suite *ts; + int i; + + if (suite->unit_test_suites) { + FOR_EACH_SUITE_TESTSUITE(i, suite, ts) { + unit_test_suite_count_tcs_on_setup_fail( + ts, test_success, sub_ts_failed, + sub_ts_skipped, sub_ts_total); + suite->total += ts->total; + suite->failed += ts->failed; + suite->skipped += ts->skipped; + if (ts->failed) + (*sub_ts_failed)++; + else + (*sub_ts_skipped)++; + (*sub_ts_total)++; + } + } else { + FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) { + if (!tc.enabled || test_success == TEST_SKIPPED) + suite->skipped++; + else + suite->failed++; + } } } static void unit_test_suite_reset_counts(struct unit_test_suite *suite) { + struct unit_test_suite *ts; + int i; + + if (suite->unit_test_suites) + FOR_EACH_SUITE_TESTSUITE(i, suite, ts) + unit_test_suite_reset_counts(ts); suite->total = 0; suite->executed = 0; suite->succeeded = 0; @@ -240,9 +270,12 @@ unit_test_suite_reset_counts(struct unit_test_suite *suite) int unit_test_suite_runner(struct unit_test_suite *suite) { - int test_success; + int test_success, i, ret; const char *status; struct unit_test_case tc; + struct unit_test_suite *ts; + unsigned int sub_ts_succeeded = 0, sub_ts_failed = 0; + unsigned int sub_ts_skipped = 0, sub_ts_total = 0; unit_test_suite_reset_counts(suite); @@ -259,70 +292,111 @@ unit_test_suite_runner(struct unit_test_suite *suite) * mark them as failed/skipped */ unit_test_suite_count_tcs_on_setup_fail(suite, - test_success); + test_success, &sub_ts_failed, + &sub_ts_skipped, &sub_ts_total); goto suite_summary; } } printf(" + ------------------------------------------------------- +\n"); - FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) { - if (!tc.enabled) { - suite->skipped++; - continue; - } else { - suite->executed++; + if (suite->unit_test_suites) { + FOR_EACH_SUITE_TESTSUITE(i, suite, ts) { + ret = unit_test_suite_runner(ts); + if (ret == TEST_SUCCESS) + sub_ts_succeeded++; + else if (ret == TEST_SKIPPED) + sub_ts_skipped++; + else + sub_ts_failed++; + sub_ts_total++; } + } else { + FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) { + if (!tc.enabled) { + suite->skipped++; + continue; + } else { + suite->executed++; + } + + /* run test case setup */ + if (tc.setup) + test_success = tc.setup(); + else + test_success = TEST_SUCCESS; + + if (test_success == TEST_SUCCESS) { + /* run the test case */ + test_success = tc.testcase(); + if (test_success == TEST_SUCCESS) + suite->succeeded++; + else if (test_success == TEST_SKIPPED) + suite->skipped++; + else if (test_success == -ENOTSUP) + suite->unsupported++; + else + suite->failed++; + } else if (test_success == -ENOTSUP) { + suite->unsupported++; + } else { + suite->failed++; + } - /* run test case setup */ - if (tc.setup) - test_success = tc.setup(); - else - test_success = TEST_SUCCESS; + /* run the test case teardown */ + if (tc.teardown) + tc.teardown(); - if (test_success == TEST_SUCCESS) { - /* run the test case */ - test_success = tc.testcase(); if (test_success == TEST_SUCCESS) - suite->succeeded++; + status = "succeeded"; else if (test_success == TEST_SKIPPED) - suite->skipped++; + status = "skipped"; else if (test_success == -ENOTSUP) - suite->unsupported++; + status = "unsupported"; else - suite->failed++; - } else if (test_success == -ENOTSUP) { - suite->unsupported++; - } else { - suite->failed++; - } + status = "failed"; - /* run the test case teardown */ - if (tc.teardown) - tc.teardown(); - - if (test_success == TEST_SUCCESS) - status = "succeeded"; - else if (test_success == TEST_SKIPPED) - status = "skipped"; - else if (test_success == -ENOTSUP) - status = "unsupported"; - else - status = "failed"; - - printf(" + TestCase [%2d] : %s %s\n", suite->total, - tc.name, status); + printf(" + TestCase [%2d] : %s %s\n", suite->total, + tc.name, status); + } } /* Run test suite teardown */ if (suite->teardown) suite->teardown(); + if (suite->unit_test_suites) + FOR_EACH_SUITE_TESTSUITE(i, suite, ts) { + suite->total += ts->total; + suite->succeeded += ts->succeeded; + suite->failed += ts->failed; + suite->skipped += ts->skipped; + suite->unsupported += ts->unsupported; + suite->executed += ts->executed; + } + goto suite_summary; suite_summary: printf(" + ------------------------------------------------------- +\n"); printf(" + Test Suite Summary : %s\n", suite->suite_name); + printf(" + ------------------------------------------------------- +\n"); + + if (suite->unit_test_suites) { + FOR_EACH_SUITE_TESTSUITE(i, suite, ts) + printf(" + %s : %d/%d passed, %d/%d skipped, " + "%d/%d failed, %d/%d unsupported\n", + ts->suite_name, ts->succeeded, ts->total, + ts->skipped, ts->total, ts->failed, ts->total, + ts->unsupported, ts->total); + printf(" + ------------------------------------------------------- +\n"); + printf(" + Sub Testsuites Total : %2d\n", sub_ts_total); + printf(" + Sub Testsuites Skipped : %2d\n", sub_ts_skipped); + printf(" + Sub Testsuites Passed : %2d\n", sub_ts_succeeded); + printf(" + Sub Testsuites Failed : %2d\n", sub_ts_failed); + printf(" + ------------------------------------------------------- +\n"); + } + printf(" + Tests Total : %2d\n", suite->total); printf(" + Tests Skipped : %2d\n", suite->skipped); printf(" + Tests Executed : %2d\n", suite->executed); diff --git a/app/test/test.h b/app/test/test.h index 10c7b496e6..e9bfc365e4 100644 --- a/app/test/test.h +++ b/app/test/test.h @@ -144,6 +144,7 @@ struct unit_test_suite { unsigned int skipped; unsigned int failed; unsigned int unsupported; + struct unit_test_suite **unit_test_suites; struct unit_test_case unit_test_cases[]; }; -- 2.25.1