[LTP] [PATCH v2] ltp-pan: Increase allowed width of test name in logs

Cyril Hrubis chrubis@suse.cz
Mon Jul 30 17:48:57 CEST 2018


Hi!
> diff --git a/pan/ltp-pan.c b/pan/ltp-pan.c
> index a2bb9b7ef..6a4508c90 100644
> --- a/pan/ltp-pan.c
> +++ b/pan/ltp-pan.c
> @@ -130,6 +130,9 @@ static char *test_out_dir = NULL;	/* dir to buffer output to */
>  zoo_t zoofile;
>  static char *reporttype = NULL;
>  
> +/* Output format of ltp-pan results */
> +#define ResultFmt	"%-50s %-10.10s %-10.10s\n";

The ltp-pan does not even compile with this because of the semicolon.

Can you please at least compile-test your changes before sumbitting.

>  /* zoolib */
>  int rec_signal;			/* received signal */
>  int send_signal;		/* signal to send */
> @@ -350,9 +353,9 @@ int main(int argc, char **argv)
>  			fprintf(logfile, "Test Start Time: %s\n", s);
>  			fprintf(logfile,
>  				"-----------------------------------------\n");
> -			fprintf(logfile, "%-30.20s %-10.10s %-10.10s\n",
> +			fprintf(logfile, ResultFmt,
>  				"Testcase", "Result", "Exit Value");
> -			fprintf(logfile, "%-30.20s %-10.10s %-10.10s\n",
> +			fprintf(logfile, ResultFmt,
>  				"--------", "------", "------------");
>  		}
>  		fflush(logfile);
> @@ -825,7 +828,7 @@ check_pids(struct tag_pgrp *running, int *num_active, int keep_active,
>  						}
>  
>  						fprintf(logfile,
> -							"%-30.30s %-10.10s %-5d\n",
> +							ResultFmt,
>  							running[i].cmd->name,
>  							result_str,
>  							w);
> @@ -1104,7 +1107,7 @@ run_child(struct coll_entry *colle, struct tag_pgrp *active, int quiet_mode,
>  				if (termid != 0)
>  					++ * failcnt;
>  
> -				fprintf(logfile, "%-30.30s %-10.10s %-5d\n",
> +				fprintf(logfile, ResultFmt,
>  					colle->name,
>  					((termid != 0) ? "FAIL" : "PASS"),
>  					termid);

Looking closer these two are actually different in the last column. So I
suppose that we can extract only the first two columns as with:

#define ResultFmt "%-50s %-10.10s"

	...
	fprintf(..., ResultFmt" %-10.10%s\n", ...);
	...
	fprintf(,,,, ResultFmt" %-5d\n", ...);
	...

-- 
Cyril Hrubis
chrubis@suse.cz


More information about the ltp mailing list