From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 102CFA0503
for <public@inbox.dpdk.org>; Fri, 20 May 2022 17:13:01 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id BCE6D427F0;
Fri, 20 May 2022 17:12:59 +0200 (CEST)
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by mails.dpdk.org (Postfix) with ESMTP id 94E7D4280B;
Fri, 20 May 2022 17:12:58 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1653059578; x=1684595578;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=6LO0wGuJEvm1WJfEeNHKZVHasfYnG9lqdgpiBuPgyEk=;
b=iekRJR0mtxNRrgKJCMwvcydQVZJ7NMStBP/h4DmcF7hk16rl4NUpc73k
ir9nfqjYSGdKkiOCchdjjy0E+9rVQqsFJcUzd+DVrLR19wUR32dMMb6t3
O2Zkc0ARdcACz0YSEVotDnqRNfCpbqyEkaaCtLNK0iiy4YdWCK0e6+4j6
H3RYHWH08dJH0r01HpGavhnTHoKUPjXL3Brq71hQ7i9u4dPRie4P65kF6
nz9Lm/cIELB2S883Wo3AXvk+rFoFLqHFoB9AKKC/NxCHUmcddI0um+HCH
CV/R57GQI8RPoN4ZSOrI2GvQlTX7bakLuqtvw73DZ1l/fFo3gLMHkP+Zs g==;
X-IronPort-AV: E=McAfee;i="6400,9594,10353"; a="260216952"
X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="260216952"
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
20 May 2022 08:12:58 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="599263772"
Received: from silpixa00401385.ir.intel.com (HELO
silpixa00401385.ger.corp.intel.com.) ([10.237.223.87])
by orsmga008.jf.intel.com with ESMTP; 20 May 2022 08:12:55 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: stable@dpdk.org, weiyuanx.li@intel.com,
Bruce Richardson <bruce.richardson@intel.com>,
Pablo de Lara <pablo.de.lara.guarch@intel.com>,
Harry van Haaren <harry.van.haaren@intel.com>,
Aaron Conole <aconole@redhat.com>
Subject: [PATCH v2 2/2] test: use cmdline library to validate args
Date: Fri, 20 May 2022 16:12:40 +0100
Message-Id: <20220520151240.139566-3-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20220520151240.139566-1-bruce.richardson@intel.com>
References: <20220520145631.137962-1-bruce.richardson@intel.com>
<20220520151240.139566-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
When passing in test names to run via either the DPDK_TEST environment
variable or via extra argv parameters, the checks run on those commands
can miss valid commands that are registered with the cmdline library in
the initial context used to set it up. This is seen in the fact that the
"dump_*" set of commands are not callable via argv parameters, but can
be called manually.
To fix this, just use the commandline library to validate each command
before executing it, stopping execution when an error is encountered.
This also has the benefit of not having the test binrary drop to
interactive mode if all commandline parameters given are invalid.
Fixes: 9b848774a5dc ("test: use env variable to run tests")
Fixes: ace2f054ed43 ("test: take test names from command line")
Bugzilla ID: 1002
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test/commands.c | 11 -----------
app/test/test.c | 24 +++++++-----------------
2 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/app/test/commands.c b/app/test/commands.c
index 887cabad64..31259e5c21 100644
--- a/app/test/commands.c
+++ b/app/test/commands.c
@@ -378,14 +378,3 @@ int commands_init(void)
cmd_autotest_autotest.string_data.str = commands;
return 0;
}
-
-int command_valid(const char *cmd)
-{
- struct test_command *t;
-
- TAILQ_FOREACH(t, &commands_list, next) {
- if (strcmp(t->command, cmd) == 0)
- return 1;
- }
- return 0;
-}
diff --git a/app/test/test.c b/app/test/test.c
index e69cae3eea..ce25f468a6 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -186,22 +186,10 @@ main(int argc, char **argv)
#ifdef RTE_LIB_CMDLINE
char *dpdk_test = getenv("DPDK_TEST");
- if (dpdk_test && strlen(dpdk_test) == 0)
- dpdk_test = NULL;
-
- if (dpdk_test && !command_valid(dpdk_test)) {
- RTE_LOG(WARNING, APP, "Invalid DPDK_TEST value '%s'\n", dpdk_test);
- dpdk_test = NULL;
- }
-
- if (dpdk_test)
+ if (dpdk_test && strlen(dpdk_test) > 0)
tests[test_count++] = dpdk_test;
- for (i = 1; i < argc; i++) {
- if (!command_valid(argv[i]))
- RTE_LOG(WARNING, APP, "Invalid test requested: '%s'\n", argv[i]);
- else
- tests[test_count++] = argv[i];
- }
+ for (i = 1; i < argc; i++)
+ tests[test_count++] = argv[i];
if (test_count > 0) {
char buf[1024];
@@ -214,9 +202,11 @@ main(int argc, char **argv)
for (i = 0; i < test_count; i++) {
snprintf(buf, sizeof(buf), "%s\n", tests[i]);
- if (cmdline_in(cl, buf, strlen(buf)) < 0) {
+ if (cmdline_parse_check(cl, buf) < 0) {
+ printf("Error: invalid test command: '%s'\n", tests[i]);
+ ret = -1;
+ } else if (cmdline_in(cl, buf, strlen(buf)) < 0) {
printf("error on cmdline input\n");
-
ret = -1;
} else
ret = last_test_result;
--
2.34.1