diff options
author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-03-04 10:34:34 +0800 |
---|---|---|
committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-04-20 15:52:28 +0800 |
commit | 1b25d1f8695d37f6ad799ba707a24053baf35b58 (patch) | |
tree | 8d061043b05c9732f0c2e8437b891aabbb771f57 | |
parent | 80206f746108d6f479d1ef457499e899331e3c5d (diff) | |
download | haskell-1b25d1f8695d37f6ad799ba707a24053baf35b58.tar.gz |
[testsuite] filter out superfluous dylib warnings
(cherry picked from commit 33c4d497545559a38bd8d1caf6c94e5e2a77647b)
-rw-r--r-- | testsuite/driver/testlib.py | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index eab13ec40c..b76f02f3a4 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -2237,10 +2237,16 @@ 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 two min versions \(10.16.0, 10.12\) for platform macOS. Using 10.12.','',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) + # ignore warning about strip invalidating signatures + s = re.sub('.*strip: changes being made to the file will invalidate the code signature in.*\n','',s) return s # normalise a .prof file, so that we can reasonably compare it against @@ -2316,6 +2322,15 @@ 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) + # ignore warning about strip invalidating signatures + s = re.sub('.*strip: changes being made to the file will invalidate the code signature in.*\n','',s) + return s def normalise_asm( s: str ) -> str: |