[igt-dev] [PATCH i-g-t] tests/tools_test: Add extra logging around chdirs
Petri Latvala
petri.latvala at intel.com
Wed Nov 13 08:09:45 UTC 2019
On Tue, Nov 12, 2019 at 06:40:12PM +0200, Arkadiusz Hiler wrote:
> Sometimes we end up in /bin and I am not able to explain that just by
> looking at the machine or the IGT tarball that was deployed there so
> let's get some more breadcrumbs.
>
> Cc: Petri Latvala <petri.latvala at intel.com>
> Issue: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/12
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
Very similar to
https://patchwork.freedesktop.org/patch/277414/?series=55233&rev=1 so
have a
Reviewed-by: Petri Latvala <petri.latvala at intel.com>
> ---
> tests/tools_test.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/tests/tools_test.c b/tests/tools_test.c
> index 88a6ae96..e3f73ac2 100644
> --- a/tests/tools_test.c
> +++ b/tests/tools_test.c
> @@ -63,14 +63,30 @@ static void assert_cmd_success(int exec_return)
> static bool chdir_to_tools_dir(void)
> {
> char path[PATH_MAX];
> + char *cwd;
> +
> + cwd = get_current_dir_name();
> + igt_info("Current working directory: %s\n", cwd);
> + free(cwd);
>
> /* Try TOOLS relative to cwd */
> + igt_info("Trying to cd to %s\n", TOOLS);
> if (chdir(TOOLS) == 0)
> return true;
>
> + igt_info("Failed to cd to %s\n", TOOLS);
> +
> /* Try TOOLS and install dir relative to test binary */
> - if (readlink("/proc/self/exe", path, sizeof(path)) > 0)
> + if (readlink("/proc/self/exe", path, sizeof(path)) > 0) {
> + igt_info("/proc/self/exe point to %s, going to dirname()\n", path);
> chdir(dirname(path));
> + }
> +
> + cwd = get_current_dir_name();
> + igt_info("Current working directory: %s\n", cwd);
> + free(cwd);
> +
> + igt_info("Trying to cd to %s or ../../bin\n", TOOLS);
>
> return chdir(TOOLS) == 0 || chdir("../../bin") == 0;
> }
> --
> 2.23.0
>
More information about the igt-dev
mailing list