[CI i-g-t 09/10] runner/settings: Serialize command line

Peter Senna Tschudin peter.senna at linux.intel.com
Sat Feb 8 13:08:46 UTC 2025



On 08.02.2025 00:09, Lucas De Marchi wrote:
> Serialize the command line to metadata.txt. The expected format in the
> metadata.txt is like below:
> 
> 	cmdline.argc : 6
> 	cmdline.argv[0] : ./build/runner/igt_runner
> 	cmdline.argv[1] : -o
> 	cmdline.argv[2] : --test-list
> 	cmdline.argv[3] : /tmp/testlist.txt
> 	cmdline.argv[4] : build/tests/
> 	cmdline.argv[5] : /tmp/results
> 

Tested-by: Peter Senna Tschudin <peter.senna at linux.intel.com>
Reviewed-by: Peter Senna Tschudin <peter.senna at linux.intel.com>
> Reviewed-by: Gustavo Sousa <gustavo.sousa at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  runner/settings.c | 24 ++++++++++++++++++++++++
>  runner/settings.h |  4 ++++
>  2 files changed, 28 insertions(+)
> 
> diff --git a/runner/settings.c b/runner/settings.c
> index 1da005806..a2fddcaf6 100644
> --- a/runner/settings.c
> +++ b/runner/settings.c
> @@ -530,6 +530,17 @@ static void free_hook_strs(struct igt_vec *hook_strs)
>  	igt_vec_fini(hook_strs);
>  }
>  
> +static void free_array_deep(void **arr, size_t n)
> +{
> +	if (!arr)
> +		return;
> +
> +	for (size_t i = 0; i < n; i++)
> +		free(arr[i]);
> +
> +	free(arr);
> +}
> +
>  static bool file_exists_at(int dirfd, const char *filename)
>  {
>  	return faccessat(dirfd, filename, F_OK, 0) == 0;
> @@ -647,6 +658,7 @@ void clear_settings(struct settings *settings)
>  	free_regexes(&settings->exclude_regexes);
>  	free_env_vars(&settings->env_vars);
>  	free_hook_strs(&settings->hook_strs);
> +	free_array_deep((void **)settings->cmdline.argv, settings->cmdline.argc);
>  
>  	init_settings(settings);
>  }
> @@ -876,6 +888,16 @@ bool parse_options(int argc, char **argv,
>  		goto error;
>  	}
>  
> +	settings->cmdline.argv = calloc(argc, sizeof(*settings->cmdline.argv));
> +	if (!settings->cmdline.argv)
> +		goto error;
> +
> +	settings->cmdline.argc = argc;
> +	for (int i = 0; i < argc; i++) {
> +		settings->cmdline.argv[i] = strdup(argv[i]);
> +		if (!settings->cmdline.argv[i])
> +			goto error;
> +	}
>  
>  	return true;
>  
> @@ -1204,6 +1226,7 @@ bool serialize_settings(struct settings *settings)
>  	SERIALIZE_INT(f, settings, enable_code_coverage);
>  	SERIALIZE_INT(f, settings, cov_results_per_test);
>  	SERIALIZE_STR(f, settings, code_coverage_script);
> +	SERIALIZE_STR_ARRAY(f, settings, cmdline.argv, cmdline.argc);
>  
>  	if (settings->sync) {
>  		fflush(f);
> @@ -1319,6 +1342,7 @@ bool read_settings_from_file(struct settings *settings, FILE *f)
>  		PARSE_INT(settings, name, val, enable_code_coverage);
>  		PARSE_INT(settings, name, val, cov_results_per_test);
>  		PARSE_STR(settings, name, val, code_coverage_script);
> +		PARSE_STR_ARRAY(settings, name, val, cmdline.argv, cmdline.argc);
>  
>  		printf("Warning: Unknown field in settings file: %s = %s\n",
>  		       name, val);
> diff --git a/runner/settings.h b/runner/settings.h
> index f69f09778..2266118a7 100644
> --- a/runner/settings.h
> +++ b/runner/settings.h
> @@ -75,6 +75,10 @@ struct settings {
>  	char *code_coverage_script;
>  	bool enable_code_coverage;
>  	bool cov_results_per_test;
> +	struct {
> +		int argc;
> +		char **argv;
> +	} cmdline;
>  };
>  
>  /**



More information about the igt-dev mailing list