d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test: allow taking extra arguments from environment

Browse Source 
When running unit tests automatically, either via script, from meson,
or otherwise, the same set of options may be used for each run, for
example to set a standard coremask to be used for all tests.

To facilitate this, this patch adds support for the test binary taking
additional EAL parameters from the environment and appending them to the
argc/argv list passed to eal init. This allows parameter modification
without having to edit test scripts etc.

There are now two environment variables which can be used for running
tests:
 * DPDK_TEST - (added previously) passes the test name to be run
               automatically rather than running the app interactively.
               Used by "meson test" when running tests individually or
               as part of a suite.

 * DPDK_TEST_PARAMS - new parameter to specify the commandline arguments
               to use with the test binary. For example to run a test,
               or tests, on only 16 lcores, and to skip pci scan we can
               set this to "-l 0-15 --no-pci".

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
Bruce Richardson 2018-10-12 16:34:04 +01:00 committed by Thomas Monjalon
parent 9af4eb5657
commit a5563b85f6
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guides/rel_notes/release_18_11.rst
View File

@ -301,6 +301,14 @@ New Features
computation to the NIST Cryptographic Algorithm Validation Program (CAVP)
test vectors.
* **Allow unit test binary to take parameters from the environment**
The unit test "test", or "dpdk-test", binary is often called from scripts,
which can make passing additional parameters, such as a coremask, to it more
awkward. Support has been added to the application to allow it to take
additional command-line parameter values from the "DPDK_TEST_PARAMS"
environment variable to make this application easier to use.
API Changes
-----------

34
test/test/test.c
View File

@ -75,15 +75,47 @@ do_recursive_call(void)
int last_test_result;
#define MAX_EXTRA_ARGS 32
int
main(int argc, char **argv)
{
#ifdef RTE_LIBRTE_CMDLINE
struct cmdline *cl;
#endif
char *extra_args;
int ret;
ret = rte_eal_init(argc, argv);
extra_args = getenv("DPDK_TEST_PARAMS");
if (extra_args != NULL && strlen(extra_args) > 0) {
char **all_argv;
char *eargv[MAX_EXTRA_ARGS];
int all_argc;
int eargc;
int i;
RTE_LOG(INFO, APP, "Using additional DPDK_TEST_PARAMS: '%s'\n",
extra_args);
eargc = rte_strsplit(extra_args, strlen(extra_args),
eargv, MAX_EXTRA_ARGS, ' ');
/* merge argc/argv and the environment args */
all_argc = argc + eargc;
all_argv = malloc(sizeof(*all_argv) * (all_argc + 1));
if (all_argv == NULL)
return -1;
for (i = 0; i < argc; i++)
all_argv[i] = argv[i];
for (i = 0; i < eargc; i++)
all_argv[argc + i] = eargv[i];
all_argv[all_argc] = NULL;
/* call eal_init with combined args */
ret = rte_eal_init(all_argc, all_argv);
free(all_argv);
} else
ret = rte_eal_init(argc, argv);
if (ret < 0) {
ret = -1;
goto out;