| Message ID | 20201026125238.2752882-1-ehabkost@redhat.com |
|---|---|
| State | Accepted |
| Commit | 8a47836548851ac00863a4f520ad761253ea4a86 |
| Headers | show |
| Series | device-crash-test: Check if path is actually an executable file | expand |
On 26/10/2020 13.52, Eduardo Habkost wrote: > After the transition to Meson, the build directory now have > subdirectories named "qemu-system-*.p", and device-crash-test > will try to execute them as if they were binaries. This results > in errors like: > > PermissionError: [Errno 13] Permission denied: './qemu-system-or1k.p' > > When generating the default list of binaries to test, check if > the path is actually a file and if it's executable. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > scripts/device-crash-test | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/scripts/device-crash-test b/scripts/device-crash-test > index 866baf7058..04118669ba 100755 > --- a/scripts/device-crash-test > +++ b/scripts/device-crash-test > @@ -383,7 +383,9 @@ def binariesToTest(args, testcase): > if args.qemu: > r = args.qemu > else: > - r = glob.glob('./qemu-system-*') > + r = [f.path for f in os.scandir('.') > + if f.name.startswith('qemu-system-') and > + f.is_file() and os.access(f, os.X_OK)] > return r Thanks, this seems to fix the issue for me! Tested-by: Thomas Huth <thuth@redhat.com>
On 10/26/20 1:52 PM, Eduardo Habkost wrote: > After the transition to Meson, the build directory now have > subdirectories named "qemu-system-*.p", and device-crash-test > will try to execute them as if they were binaries. This results > in errors like: > > PermissionError: [Errno 13] Permission denied: './qemu-system-or1k.p' > > When generating the default list of binaries to test, check if > the path is actually a file and if it's executable. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > scripts/device-crash-test | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 866baf7058..04118669ba 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -383,7 +383,9 @@ def binariesToTest(args, testcase): if args.qemu: r = args.qemu else: - r = glob.glob('./qemu-system-*') + r = [f.path for f in os.scandir('.') + if f.name.startswith('qemu-system-') and + f.is_file() and os.access(f, os.X_OK)] return r
After the transition to Meson, the build directory now have subdirectories named "qemu-system-*.p", and device-crash-test will try to execute them as if they were binaries. This results in errors like: PermissionError: [Errno 13] Permission denied: './qemu-system-or1k.p' When generating the default list of binaries to test, check if the path is actually a file and if it's executable. Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- scripts/device-crash-test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)