From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D279C02198 for ; Sat, 8 Feb 2025 13:08:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 54C5F10E030; Sat, 8 Feb 2025 13:08:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="abQeloh8"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id E28E510E030 for ; Sat, 8 Feb 2025 13:08:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739020130; x=1770556130; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=TChTkJ1fUlewHHA7GAQU4GuYadp5fx8lYLXJjkyjqlA=; b=abQeloh8o1XHZ53CwINujtM3/NLWQu/SJlitms+3QYAkFe4n4KR9IJ1P /+6+4uDvt0laJyEZrvXW7mNZH8kdlbibo6Vk5mD0A4wWp14BY8aX0BRik gqsHHd2VUflbpz1i2bDGNrP5UWKXSw9DQJAlezgQU4MNw0thSRSwT06O5 H1ag844pTbBn6G0fE7f18DPrbtAMIVmZ/PgtAHE57+akvQe8JRyQ5sMXa WyUT4mBs0QmMonKBo5oOh6HcJEcdjc0xSUjBrTxgfdOR44tFMisexgYku RhQc/EMc687EAW5IsLmDFB6T7d93GF++W68Yr0CaCD0ADd2hgnuj3c6TJ g==; X-CSE-ConnectionGUID: 2LCtFfguTje0qtV00XqL8Q== X-CSE-MsgGUID: LlImLKM2SoeywXA0MObFpg== X-IronPort-AV: E=McAfee;i="6700,10204,11339"; a="51042206" X-IronPort-AV: E=Sophos;i="6.13,270,1732608000"; d="scan'208";a="51042206" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2025 05:08:50 -0800 X-CSE-ConnectionGUID: 68druHzrT/S7l/90+RJtww== X-CSE-MsgGUID: t0iItKzzQBmMZNQbpxT3Yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,270,1732608000"; d="scan'208";a="142638459" Received: from arossa-mobl1.ger.corp.intel.com (HELO [10.245.98.254]) ([10.245.98.254]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2025 05:08:49 -0800 Message-ID: <4e69d895-05b6-4749-ade1-ae2344384618@linux.intel.com> Date: Sat, 8 Feb 2025 14:08:46 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [CI i-g-t 09/10] runner/settings: Serialize command line To: Lucas De Marchi , igt-dev@lists.freedesktop.org References: <20250207231039.2883195-2-lucas.demarchi@intel.com> <20250207231039.2883195-11-lucas.demarchi@intel.com> Content-Language: en-US From: Peter Senna Tschudin In-Reply-To: <20250207231039.2883195-11-lucas.demarchi@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" 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 Reviewed-by: Peter Senna Tschudin > Reviewed-by: Gustavo Sousa > Signed-off-by: Lucas De Marchi > --- > 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; > }; > > /**