diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2020-02-27 22:19:00 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-27 16:33:21 -0800 |
| commit | 63d67e20425b2da6668231fead3f86e16e163943 (patch) | |
| tree | d26a120f25a707e3db3b2ffd94be9c5a83e99a1c /test cases/linuxlike | |
| parent | 0fbd09609f4b94d8f69a0db0e91c754402aba10f (diff) | |
| download | meson-63d67e20425b2da6668231fead3f86e16e163943.zip meson-63d67e20425b2da6668231fead3f86e16e163943.tar.gz meson-63d67e20425b2da6668231fead3f86e16e163943.tar.bz2 | |
Fix 'linuxlike/14 static dynamic linkage' test on Cygwin
Update the expected output from nm to match changes in binutils 2.34.
Diffstat (limited to 'test cases/linuxlike')
| -rwxr-xr-x | test cases/linuxlike/14 static dynamic linkage/verify_static.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/linuxlike/14 static dynamic linkage/verify_static.py b/test cases/linuxlike/14 static dynamic linkage/verify_static.py index 594f194..8d16d48 100755 --- a/test cases/linuxlike/14 static dynamic linkage/verify_static.py +++ b/test cases/linuxlike/14 static dynamic linkage/verify_static.py @@ -13,7 +13,7 @@ def handle_common(path): def handle_cygwin(path): """Handle the Cygwin case.""" output = subprocess.check_output(['nm', path]).decode('utf-8') - if 'I __imp_zlibVersion' in output: + if (('I __imp_zlibVersion' in output) or ('D __imp_zlibVersion' in output)): return 1 return 0 |