diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2019-02-15 11:46:22 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-18 09:25:21 +0100 |
commit | 9fa698b02358807c20444a6bc5a9ab8f311c4922 (patch) | |
tree | a7a301ac1431b4619d3fcac6f85565ce3820b632 /.gitlab-ci-private.yml | |
parent | 4843a27bbc2f2017314ad9508d61ac4c44330e77 (diff) | |
download | samba-9fa698b02358807c20444a6bc5a9ab8f311c4922.tar.gz |
wafsamba/symbols: change regex to match both rpath and runpath for different readelf output
In `wafsamba.dumplicate_symbols` test, it will use Popen to call:
readelf --dynamic bin/default/source3/lib/netapi/examples/netlogon/netlogon_control2
then try to find rpath lib lines from output with regex:
re_rpath = re.compile(b'Library rpath: \[(.*)\]')
In ubuntu 14.04 docker image, which current CI is using, the actual output
from `readelf` is `runpath` instead of 'rpath':
...
Library runpath: [/home/gitlab-runner/samba/bin/shared:/home/gitlab-runner/samba/bin/shared/private]\n'
...
So the regex never matched, and hide a bug.
In Ubuntu 1604 docker image, the output changes to `rpath` and matched the
regex, which expose the error in previous commit.
Improve the regex to match both `rpath` and `runpath`.
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to '.gitlab-ci-private.yml')
0 files changed, 0 insertions, 0 deletions