From: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: swati2.sharma@intel.com, santhosh.reddy.guddati@intel.com,
Naladala Ramanaidu <ramanaidu.naladala@intel.com>
Subject: [PATCH i-g-t v2 3/5] runner/settings: Add function to set IGT_RUNNER_DATA environment variable
Date: Wed, 8 Jan 2025 01:36:12 +0530 [thread overview]
Message-ID: <20250107200614.963199-4-ramanaidu.naladala@intel.com> (raw)
In-Reply-To: <20250107200614.963199-1-ramanaidu.naladala@intel.com>
Introduced set_runner_datadir() to set the IGT_RUNNER_DATA environment
variable. This function uses absolute_path() to convert the relative
path "../share/igt-gpu-tools" to an absolute path. Update the
runner/runner code to call set_runner_datadir() and handle errors
appropriately.
v2: Fix review comments. (Kamil)
Signed-off-by: Naladala Ramanaidu <ramanaidu.naladala@intel.com>
---
runner/runner.c | 8 ++++++++
runner/settings.c | 9 +++++++++
runner/settings.h | 1 +
3 files changed, 18 insertions(+)
diff --git a/runner/runner.c b/runner/runner.c
index 4855ad641..950eb5662 100644
--- a/runner/runner.c
+++ b/runner/runner.c
@@ -12,8 +12,13 @@ int main(int argc, char **argv)
struct job_list job_list;
struct execute_state state;
int exitcode = 0;
+ int data_flag = 0;
init_settings(&settings);
+ data_flag = set_runner_datadir();
+ if (data_flag)
+ fprintf(stderr, "Data dir path not set\n");
+
init_job_list(&job_list);
if (!parse_options(argc, argv, &settings)) {
@@ -49,6 +54,9 @@ int main(int argc, char **argv)
exitcode = 1;
}
+ if (!data_flag)
+ unsetenv("IGT_RUNNER_DATA");
+
printf("Done.\n");
return exitcode;
}
diff --git a/runner/settings.c b/runner/settings.c
index bea0c3059..c8220be32 100644
--- a/runner/settings.c
+++ b/runner/settings.c
@@ -589,6 +589,15 @@ char *absolute_path(const char *path)
return result;
}
+int set_runner_datadir(void)
+{
+ const char *datapath = "../share/igt-gpu-tools";
+ char *abpath;
+
+ abpath = absolute_path(datapath);
+ return setenv("IGT_RUNNER_DATA", abpath, 1);
+}
+
static char *bin_path(char *fname)
{
char *path, *p;
diff --git a/runner/settings.h b/runner/settings.h
index 7e6cd11e2..5926817b6 100644
--- a/runner/settings.h
+++ b/runner/settings.h
@@ -150,5 +150,6 @@ bool serialize_settings(struct settings *settings);
bool read_settings_from_file(struct settings *settings, FILE* f);
bool read_settings_from_dir(struct settings *settings, int dirfd);
+int set_runner_datadir(void);
#endif
--
2.43.0
next prev parent reply other threads:[~2025-01-07 20:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-07 20:06 [PATCH i-g-t v2 0/5] Update image assets Naladala Ramanaidu
2025-01-07 20:06 ` [PATCH i-g-t v2 1/5] data: Move PNG images to new data directory Naladala Ramanaidu
2025-01-07 20:06 ` [PATCH i-g-t v2 2/5] runner/settings: Constify absolute_path parameter Naladala Ramanaidu
2025-01-16 12:29 ` Kamil Konieczny
2025-01-07 20:06 ` Naladala Ramanaidu [this message]
2025-01-16 9:51 ` [PATCH i-g-t v2 3/5] runner/settings: Add function to set IGT_RUNNER_DATA environment variable Kamil Konieczny
2025-01-16 12:36 ` Kamil Konieczny
2025-02-18 21:14 ` Naladala, Ramanaidu
2025-01-07 20:06 ` [PATCH i-g-t v2 4/5] lib/igt_core: Enhance __igt_fopen_data to support additional directories Naladala Ramanaidu
2025-01-07 20:06 ` [PATCH i-g-t v2 5/5] HAX patch do not merge Naladala Ramanaidu
2025-01-07 23:16 ` ✗ i915.CI.BAT: failure for Update image assets (rev3) Patchwork
2025-01-07 23:17 ` ✓ Xe.CI.BAT: success " Patchwork
2025-01-09 15:19 ` ✗ Xe.CI.Full: failure " Patchwork
2025-01-10 6:37 ` ✓ i915.CI.BAT: success " Patchwork
2025-01-14 11:48 ` ✗ i915.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250107200614.963199-4-ramanaidu.naladala@intel.com \
--to=ramanaidu.naladala@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=santhosh.reddy.guddati@intel.com \
--cc=swati2.sharma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox