Commit 49db2b63 authored by Jérome Perrin's avatar Jérome Perrin

testcase/checkExecutableLink: tolerate rpath with double slashes

When running with shared parts from slaprunner, we'll have path with
double slashes like:

    /srv/slapgrid/slappart3/srv//runner//shared/libexpat/468993ea3777c1a342102bc1c4b43425/lib/libexpat.so.1

because slaprunner has some paths with double slash.

See merge request !191
parents 59e50e77 03979043
Pipeline #8299 passed with stage
in 0 seconds
...@@ -276,6 +276,7 @@ def checkSoftware(slap, software_url): ...@@ -276,6 +276,7 @@ def checkSoftware(slap, software_url):
for lib, lib_path in libs.items(): for lib, lib_path in libs.items():
if lib.split('.')[0] in system_lib_white_list: if lib.split('.')[0] in system_lib_white_list:
continue continue
lib_path = os.path.realpath(lib_path)
# dynamically linked programs can only be linked with libraries # dynamically linked programs can only be linked with libraries
# present in software or in shared parts repository. # present in software or in shared parts repository.
if any(lib_path.startswith(valid_path) if any(lib_path.startswith(valid_path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment