From: "Almahallawy, Khaled" <khaled.almahallawy@intel.com>
To: "igt-dev@lists.freedesktop.org" <igt-dev@lists.freedesktop.org>,
"Navare, Manasi D" <manasi.d.navare@intel.com>
Cc: "Latvala, Petri" <petri.latvala@intel.com>
Subject: Re: [igt-dev] [PATCH i-g-t v2] tools: Fix running intel_dp_compliance if it is found in the search path($PATH env variable)
Date: Thu, 8 Apr 2021 23:26:55 +0000 [thread overview]
Message-ID: <6ec0d38f64d3a44d5d68a2592ead2afa1cdbdb78.camel@intel.com> (raw)
In-Reply-To: <44e841ff418c488a9998817113b2cfd5@intel.com>
Hi Manasi,
There is no gitlab issue. Just trying to save extra time spent
communicating with ODMs and false positives they report when
intel_dp_compliance doesn’t work.
Thank you and Petri for review and feedback.
~Khaled
On Thu, 2021-04-08 at 22:26 +0000, Navare, Manasi D wrote:
> If there is a Gitlab issue around it please mention that in the
> commit message.
> Else this looks good to me
>
> Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
>
> Manasi
>
> -----Original Message-----
> From: Almahallawy, Khaled <khaled.almahallawy@intel.com>
> Sent: Thursday, April 8, 2021 2:51 PM
> To: igt-dev@lists.freedesktop.org
> Cc: Latvala, Petri <petri.latvala@intel.com>; Navare, Manasi D <
> manasi.d.navare@intel.com>; Almahallawy, Khaled <
> khaled.almahallawy@intel.com>
> Subject: [PATCH i-g-t v2] tools: Fix running intel_dp_compliance if
> it is found in the search path($PATH env variable)
>
> When intel_dp_compliance binary location is part of PATH environment
> variable, running it from the shell without relative or full path,
> cause the following assertion failure because chdir:
>
> $:~# intel_dp_compliance
> (intel_dp_compliance:3070) CRITICAL: Test assertion failure function
> enter_exec_path, file ../tools/igt_compliance_utils.c:56:
> (intel_dp_compliance:3070) CRITICAL: Failed assertion: ret == 0
> (intel_dp_compliance:3070) CRITICAL: Last errno: 2, No such file or
> directory
> (intel_dp_compliance:3070) CRITICAL: error: -1 != 0 Stack trace:
> #0 ../lib/igt_core.c:1726 __igt_fail_assert()
> #1 [enter_exec_path+0x8b]
> #2 ../tools/intel_dp_compliance.c:843 main()
> #3 ../csu/libc-start.c:342 __libc_start_main()
> #4 [_start+0x2e]
> Test (null) failed.
> **** DEBUG ****
> (intel_dp_compliance:3070) CRITICAL: Test assertion failure function
> enter_exec_path, file ../tools/igt_compliance_utils.c:56:
> (intel_dp_compliance:3070) CRITICAL: Failed assertion: ret == 0
> (intel_dp_compliance:3070) CRITICAL: Last errno: 2, No such file or
> directory
> (intel_dp_compliance:3070) CRITICAL: error: -1 != 0
> (intel_dp_compliance:3070) igt_core-INFO: Stack trace:
> (intel_dp_compliance:3070) igt_core-INFO: #0 ../lib/igt_core.c:1726
> __igt_fail_assert()
> (intel_dp_compliance:3070) igt_core-INFO: #1 [enter_exec_path+0x8b]
> (intel_dp_compliance:3070) igt_core-INFO: #2
> ../tools/intel_dp_compliance.c:843 main()
> (intel_dp_compliance:3070) igt_core-INFO: #3 ../csu/libc-
> start.c:342 __libc_start_main()
> (intel_dp_compliance:3070) igt_core-INFO: #4 [_start+0x2e]
> **** END ****
> FAIL (-1.000s)
>
> This patch fixes this issue.
>
> v2: (PATH_MAX - 1) and dirname (Petri)
>
> Signed-off-by: Khaled Almahallawy <khaled.almahallawy@intel.com>
> ---
> tools/igt_compliance_utils.c | 20 ++++++--------------
> 1 file changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/tools/igt_compliance_utils.c
> b/tools/igt_compliance_utils.c index d6a2e4e529d9..0faf3fc874e6
> 100644
> --- a/tools/igt_compliance_utils.c
> +++ b/tools/igt_compliance_utils.c
> @@ -29,7 +29,7 @@
> #include <stdlib.h>
> #include <signal.h>
> #include <termios.h>
> -
> +#include <libgen.h>
> #include <sys/stat.h>
>
> #include "igt_dp_compliance.h"
> @@ -39,22 +39,14 @@ struct termios saved_tio;
>
> void enter_exec_path(char **argv)
> {
> -char *exec_path = NULL;
> -char *pos = NULL;
> -short len_path = 0;
> +char exec_path[PATH_MAX];
> int ret;
>
> -len_path = strlen(argv[0]);
> -exec_path = (char *) malloc(len_path);
> -
> -memcpy(exec_path, argv[0], len_path);
> -pos = strrchr(exec_path, '/');
> -if (pos != NULL)
> -*(pos+1) = '\0';
> -
> -ret = chdir(exec_path);
> +memset(exec_path, 0, sizeof(exec_path));
> +ret = readlink("/proc/self/exe", exec_path, sizeof(exec_path)-1);
> +igt_assert(ret != -1);
> +ret = chdir(dirname(exec_path));
> igt_assert_eq(ret, 0);
> -free(exec_path);
> }
>
> static void restore_termio_mode(int sig)
> --
> 2.25.1
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2021-04-08 23:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 0:21 [igt-dev] [PATCH i-g-t] tools: Fix running intel_dp_compliance if it is found in the search path($PATH env variable) Khaled Almahallawy
2021-04-08 0:50 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2021-04-08 3:23 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2021-04-08 9:10 ` [igt-dev] [PATCH i-g-t] " Petri Latvala
2021-04-08 21:51 ` [igt-dev] [PATCH i-g-t v2] " Khaled Almahallawy
2021-04-08 22:26 ` Navare, Manasi D
2021-04-08 23:26 ` Almahallawy, Khaled [this message]
2021-04-09 8:03 ` Petri Latvala
2021-04-08 23:38 ` [igt-dev] ✓ Fi.CI.BAT: success for tools: Fix running intel_dp_compliance if it is found in the search path($PATH env variable) (rev3) Patchwork
2021-04-09 2:37 ` [igt-dev] ✓ Fi.CI.IGT: " 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=6ec0d38f64d3a44d5d68a2592ead2afa1cdbdb78.camel@intel.com \
--to=khaled.almahallawy@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=manasi.d.navare@intel.com \
--cc=petri.latvala@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.