[PATCH] test: fix option block

Stephen Hemminger stephen at networkplumber.org
Mon Oct 7 19:02:55 CEST 2024


On Thu, 14 Mar 2024 09:46:26 +0000
Mingjin Ye <mingjinx.ye at intel.com> wrote:

> The options allow (-a) and block (-b) cannot be used at the same time.
> Therefore, allow (-a) will not be added when block (-b) is present.
> 
> Fixes: b3ce7891ad38 ("test: fix probing in secondary process")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Mingjin Ye <mingjinx.ye at intel.com>
> ---
>  app/test/process.h | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/app/test/process.h b/app/test/process.h
> index 9fb2bf481c..388c7975cd 100644
> --- a/app/test/process.h
> +++ b/app/test/process.h
> @@ -44,7 +44,7 @@ add_parameter_allow(char **argv, int max_capacity)
>  	int count = 0;
>  
>  	RTE_EAL_DEVARGS_FOREACH(NULL, devargs) {
> -		if (strlen(devargs->name) == 0)
> +		if (strlen(devargs->name) == 0 || devargs->type != RTE_DEVTYPE_ALLOWED)
>  			continue;
>  
>  		if (devargs->data == NULL || strlen(devargs->data) == 0) {
> @@ -74,7 +74,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
>  {
>  	int num = 0;
>  	char **argv_cpy;
> -	int allow_num;
> +	int allow_num, block_num;
>  	int argv_num;
>  	int i, status;
>  	char path[32];
> @@ -89,7 +89,18 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
>  	if (pid < 0)
>  		return -1;
>  	else if (pid == 0) {
> -		allow_num = rte_devargs_type_count(RTE_DEVTYPE_ALLOWED);
> +		allow_num = 0;
> +		block_num = 0;
> +
> +		/* If block (-b) is present, allow (-a) is not added. */
> +		for (i = 0; i < numargs; i++) {
> +			if (strcmp(argv[i], "-b") == 0 ||
> +			    strcmp(argv[i], "-block") == 0)

The long form of the option is "--block" not "-block".

Why is a test infrastructure adding both options anyway, seems like that is the real problem.



More information about the dev mailing list