From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 3CFF9A0548;
Fri, 2 Apr 2021 16:24:48 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 16714140FDA;
Fri, 2 Apr 2021 16:24:45 +0200 (CEST)
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
by mails.dpdk.org (Postfix) with ESMTP id 39B44140FC1
for <dev@dpdk.org>; Fri, 2 Apr 2021 16:24:43 +0200 (CEST)
IronPort-SDR: FR0XD2HBj6kS/OM5nGDSpRND5bTCOy8CvC7GiIJ+N584DOyOlBlnmuF1wGbIHH0R1uLYUAmUbc
9YiczIeZOKEA==
X-IronPort-AV: E=McAfee;i="6000,8403,9942"; a="192512447"
X-IronPort-AV: E=Sophos;i="5.81,300,1610438400"; d="scan'208";a="192512447"
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:42 -0700
IronPort-SDR: e6dXJSWcdxJjEyexq08fERcTkZ9s7JzVjM45XtnrJl1/q7tXEhq6UR2Je3Vu17CNmk8uXoEij/
gQ9HpsKNszaA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.81,300,1610438400"; d="scan'208";a="413199561"
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:39 -0700
From: Ciara Power <ciara.power@intel.com>
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 <ciara.power@intel.com>
Date: Fri, 2 Apr 2021 14:24:19 +0000
Message-Id: <20210402142424.1353789-2-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 1/6] app/test: refactor of unit test suite
runner
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Some small changes were made to the unit test suite runner for
readability and to enable reuse of some of the function in a later patch.
On test suite setup skip/fail, the loop to count testcases as
skipped/failed has been moved to another function.
This will allow for recursion in a later patch when nested sub-testsuites
are used.
The unit test suite runner accessed the list of testcases in the suite
structure every time the testcase was used. This is now replaced by a
testcase variable which improves readability.
A macro has been introduced for readability, instead of using open
coded loops.
Rather than keep local variable status counts for testcases,
these are added to the test suite structure.
The summary output now prints the suite name, this will be useful later
when multiple nested sub-testsuites are being run.
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
v2:
- Added macro to loop testcases in suite.
- Testcase counts added to the test suite structure.
---
app/test/test.c | 101 +++++++++++++++++++++++++++++-------------------
app/test/test.h | 6 +++
2 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/app/test/test.c b/app/test/test.c
index 624dd48042..a795cba1bb 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -36,6 +36,11 @@ extern cmdline_parse_ctx_t main_ctx[];
#define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
+#define FOR_EACH_SUITE_TESTCASE(iter, suite, case) \
+ for (iter = 0, case = suite->unit_test_cases[0]; \
+ suite->unit_test_cases[iter].testcase; \
+ iter++, case = suite->unit_test_cases[iter])
+
const char *prgname; /* to be set to argv[0] */
static const char *recursive_call; /* used in linux for MP and other tests */
@@ -207,14 +212,39 @@ main(int argc, char **argv)
return ret;
}
+static void
+unit_test_suite_count_tcs_on_setup_fail(struct unit_test_suite *suite,
+ int test_success)
+{
+ 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++;
+ }
+}
+
+static void
+unit_test_suite_reset_counts(struct unit_test_suite *suite)
+{
+ suite->total = 0;
+ suite->executed = 0;
+ suite->succeeded = 0;
+ suite->skipped = 0;
+ suite->failed = 0;
+ suite->unsupported = 0;
+}
int
unit_test_suite_runner(struct unit_test_suite *suite)
{
int test_success;
- unsigned int total = 0, executed = 0, skipped = 0;
- unsigned int succeeded = 0, failed = 0, unsupported = 0;
const char *status;
+ struct unit_test_case tc;
+
+ unit_test_suite_reset_counts(suite);
if (suite->suite_name) {
printf(" + ------------------------------------------------------- +\n");
@@ -228,55 +258,48 @@ unit_test_suite_runner(struct unit_test_suite *suite)
* setup did not pass, so count all enabled tests and
* mark them as failed/skipped
*/
- while (suite->unit_test_cases[total].testcase) {
- if (!suite->unit_test_cases[total].enabled ||
- test_success == TEST_SKIPPED)
- skipped++;
- else
- failed++;
- total++;
- }
+ unit_test_suite_count_tcs_on_setup_fail(suite,
+ test_success);
goto suite_summary;
}
}
printf(" + ------------------------------------------------------- +\n");
- while (suite->unit_test_cases[total].testcase) {
- if (!suite->unit_test_cases[total].enabled) {
- skipped++;
- total++;
+ FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) {
+ if (!tc.enabled) {
+ suite->skipped++;
continue;
} else {
- executed++;
+ suite->executed++;
}
/* run test case setup */
- if (suite->unit_test_cases[total].setup)
- test_success = suite->unit_test_cases[total].setup();
+ if (tc.setup)
+ test_success = tc.setup();
else
test_success = TEST_SUCCESS;
if (test_success == TEST_SUCCESS) {
/* run the test case */
- test_success = suite->unit_test_cases[total].testcase();
+ test_success = tc.testcase();
if (test_success == TEST_SUCCESS)
- succeeded++;
+ suite->succeeded++;
else if (test_success == TEST_SKIPPED)
- skipped++;
+ suite->skipped++;
else if (test_success == -ENOTSUP)
- unsupported++;
+ suite->unsupported++;
else
- failed++;
+ suite->failed++;
} else if (test_success == -ENOTSUP) {
- unsupported++;
+ suite->unsupported++;
} else {
- failed++;
+ suite->failed++;
}
/* run the test case teardown */
- if (suite->unit_test_cases[total].teardown)
- suite->unit_test_cases[total].teardown();
+ if (tc.teardown)
+ tc.teardown();
if (test_success == TEST_SUCCESS)
status = "succeeded";
@@ -287,10 +310,8 @@ unit_test_suite_runner(struct unit_test_suite *suite)
else
status = "failed";
- printf(" + TestCase [%2d] : %s %s\n", total,
- suite->unit_test_cases[total].name, status);
-
- total++;
+ printf(" + TestCase [%2d] : %s %s\n", suite->total,
+ tc.name, status);
}
/* Run test suite teardown */
@@ -301,20 +322,20 @@ unit_test_suite_runner(struct unit_test_suite *suite)
suite_summary:
printf(" + ------------------------------------------------------- +\n");
- printf(" + Test Suite Summary \n");
- printf(" + Tests Total : %2d\n", total);
- printf(" + Tests Skipped : %2d\n", skipped);
- printf(" + Tests Executed : %2d\n", executed);
- printf(" + Tests Unsupported: %2d\n", unsupported);
- printf(" + Tests Passed : %2d\n", succeeded);
- printf(" + Tests Failed : %2d\n", failed);
+ printf(" + Test Suite Summary : %s\n", suite->suite_name);
+ printf(" + Tests Total : %2d\n", suite->total);
+ printf(" + Tests Skipped : %2d\n", suite->skipped);
+ printf(" + Tests Executed : %2d\n", suite->executed);
+ printf(" + Tests Unsupported: %2d\n", suite->unsupported);
+ printf(" + Tests Passed : %2d\n", suite->succeeded);
+ printf(" + Tests Failed : %2d\n", suite->failed);
printf(" + ------------------------------------------------------- +\n");
- last_test_result = failed;
+ last_test_result = suite->failed;
- if (failed)
+ if (suite->failed)
return TEST_FAILED;
- if (total == skipped)
+ if (suite->total == suite->skipped)
return TEST_SKIPPED;
return TEST_SUCCESS;
}
diff --git a/app/test/test.h b/app/test/test.h
index b07f6c1ef0..10c7b496e6 100644
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -138,6 +138,12 @@ struct unit_test_suite {
const char *suite_name;
int (*setup)(void);
void (*teardown)(void);
+ unsigned int total;
+ unsigned int executed;
+ unsigned int succeeded;
+ unsigned int skipped;
+ unsigned int failed;
+ unsigned int unsupported;
struct unit_test_case unit_test_cases[];
};
--
2.25.1