[LTP] [RFC PATCH v2 1/2] include/tst_test_macros.h: Add TST_EXP_SILENT_{PASS, FD} macros

[Cyril Hrubis]

Hi!
> 1) TST_EXP_SILENT_{PASS,FD} don't report TPASS when SCALL succeeds.
> 2) TST_EXP_{PASS,FD} calls TST_EXP_SILENT_{PASS,FD} and report
>    TPASS when SCALL succeeds.

I think that the macros should have the silent after the {PASS,FD} since
that would be less confusing. I other words what is silent fd?

So I would name these as TST_EXP_FD_SILENT() or maybe
TST_EXP_FD_QUIET().

Other than that the change looks good.

> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  include/tst_test_macros.h | 25 ++++++++++++++++++-------
>  1 file changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/include/tst_test_macros.h b/include/tst_test_macros.h
> index 3016d95c2..8b71da00b 100644
> --- a/include/tst_test_macros.h
> +++ b/include/tst_test_macros.h
> @@ -46,7 +46,7 @@ extern void *TST_RET_PTR;
>  	tst_res_(__FILE__, __LINE__, RES, \
>  		TST_FMT_(TST_2_(dummy, ##__VA_ARGS__, SCALL) FMT, __VA_ARGS__), PAR)
>  
> -#define TST_EXP_FD(SCALL, ...)                                                 \
> +#define TST_EXP_SILENT_FD(SCALL, ...)                                          \
>  	do {                                                                   \
>  		TEST(SCALL);                                                   \
>  		                                                               \
> @@ -64,14 +64,20 @@ extern void *TST_RET_PTR;
>  			break;                                                 \
>  		}                                                              \
>                                                                                 \
> -		TST_MSGP_(TPASS, " returned fd %ld", TST_RET,                  \
> -		         #SCALL, ##__VA_ARGS__);                               \
> -                                                                               \
>  		TST_PASS = 1;                                                  \
>                                                                                 \
>  	} while (0)
>  
> -#define TST_EXP_PASS(SCALL, ...)                                               \
> +#define TST_EXP_FD(SCALL, ...)                                                 \
> +	do {                                                                   \
> +		TST_EXP_SILENT_FD(SCALL, __VA_ARGS__);                         \
> +		                                                               \
> +		if (TST_PASS)                                                  \
> +			TST_MSGP_(TPASS, " returned fd %ld", TST_RET,          \
> +				#SCALL, ##__VA_ARGS__);                        \
> +	} while (0)
> +
> +#define TST_EXP_SILENT_PASS(SCALL, ...)                                        \
>  	do {                                                                   \
>  		TEST(SCALL);                                                   \
>  		                                                               \
> @@ -89,12 +95,17 @@ extern void *TST_RET_PTR;
>  			break;                                                 \
>  		}                                                              \
>                                                                                 \
> -		TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__);             \
> -                                                                               \
>  		TST_PASS = 1;                                                  \
>                                                                                 \
>  	} while (0)
>  
> +#define TST_EXP_PASS(SCALL, ...)                                               \
> +	do {                                                                   \
> +		TST_EXP_SILENT_PASS(SCALL, __VA_ARGS__);                       \
> +		                                                               \
> +		if (TST_PASS)                                                  \
> +			TST_MSG_(TPASS, " passed", #SCALL, ##__VA_ARGS__);     \
> +	} while (0)                                                            \
>  
>  #define TST_EXP_FAIL(SCALL, ERRNO, ...)                                        \
>  	do {                                                                   \
> -- 
> 2.21.0
> 
> 
> 

-- 
Cyril Hrubis
chrubis@suse.cz