sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code
e8e4f35bb1
samba-mirror/buildtools
History
Joe Guo 9fa698b023 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>
2019-02-18 09:25:21 +01:00
..
bin build: Move python detection back into waf (instead of in configure and Makefile) 2018-12-14 14:40:19 +01:00
examples PY3: change shebang to python3 in misc dirs 2018-12-14 18:00:40 +01:00
scripts abi_gen.sh: ignore gdb customisations when comparing signatures 2019-02-02 20:19:05 +01:00
wafsamba wafsamba/symbols: change regex to match both rpath and runpath for different readelf output 2019-02-18 09:25:21 +01:00
compare_config_h4.sh waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes 2010-12-02 10:36:06 +01:00
compare_generated.sh waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes 2010-12-02 10:36:06 +01:00
compare_install.sh waf/buildtools: use /bin/sh instead of /bin/bash and put ^ in quotes 2010-12-02 10:36:06 +01:00
README Include waf as an extracted source directory, rather than as a one-in-a-file script. 2012-01-04 22:34:20 +01:00
testwaf.sh ldb: make ldb a top level library for Samba 4.0 2011-07-05 17:24:47 +10:00

README 

See http://code.google.com/p/waf/ for more information on waf

You can get a svn copy of the upstream source with:

  svn checkout http://waf.googlecode.com/svn/trunk/ waf-read-only

Samba currently uses waf 1.5, which can be found at:

  http://waf.googlecode.com/svn/branches/waf-1.5

To update the current copy of waf, use the update-waf.sh script in this
directory.