From 63d67e20425b2da6668231fead3f86e16e163943 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 27 Feb 2020 22:19:00 +0000 Subject: Fix 'linuxlike/14 static dynamic linkage' test on Cygwin Update the expected output from nm to match changes in binutils 2.34. --- test cases/linuxlike/14 static dynamic linkage/verify_static.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.1