summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-03-04 10:34:34 +0800
committerMoritz Angermann <moritz.angermann@gmail.com>2021-03-07 22:19:21 +0800
commit33c4d497545559a38bd8d1caf6c94e5e2a77647b (patch)
tree01dd6b8c6ea718a1b64d05520b51b352c99b66f7
parentf358cf7df84984a4c0d16f41f8f84af3141a6d6e (diff)
downloadhaskell-33c4d497545559a38bd8d1caf6c94e5e2a77647b.tar.gz
[testsuite] filter out superfluous dylib warnings
-rw-r--r--testsuite/driver/testlib.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index e965b84b04..3412ad7994 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -2125,10 +2125,11 @@ def normalise_errmsg(s: str) -> str:
# and not understood by older binutils (ar, ranlib, ...)
s = modify_lines(s, lambda l: re.sub('^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE \(5\) type: 0xc000000(.*)$', '', l))
- # filter out nix garbage, that just keeps on showing up as errors on darwin
- s = modify_lines(s, lambda l: re.sub('^(.+)\.dylib, ignoring unexpected dylib file$','', l))
s = re.sub('ld: warning: passed .* min versions \(.*\) for platform macOS. Using [\.0-9]+.','',s)
s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s)
+ # ignore superfluous dylibs passed to the linker.
+ s = re.sub('ld: warning: .*, ignoring unexpected dylib file\n','',s)
+ # ignore LLVM Version mismatch garbage; this will just break tests.
s = re.sub('You are using an unsupported version of LLVM!.*\n','',s)
s = re.sub('Currently only [\.0-9]+ is supported. System LLVM version: [\.0-9]+.*\n','',s)
s = re.sub('We will try though\.\.\..*\n','',s)
@@ -2207,6 +2208,9 @@ def normalise_output( s: str ) -> str:
s = re.sub(' -fexternal-dynamic-refs\n','',s)
s = re.sub('ld: warning: passed .* min versions \(.*\) for platform macOS. Using [\.0-9]+.','',s)
s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s)
+ # ignore superfluous dylibs passed to the linker.
+ s = re.sub('ld: warning: .*, ignoring unexpected dylib file\n','',s)
+ # ignore LLVM Version mismatch garbage; this will just break tests.
s = re.sub('You are using an unsupported version of LLVM!.*\n','',s)
s = re.sub('Currently only [\.0-9]+ is supported. System LLVM version: [\.0-9]+.*\n','',s)
s = re.sub('We will try though\.\.\..*\n','',s)