diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-02-13 11:57:39 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-02-17 07:42:11 +0800 |
| commit | 5d19fca382cf70c0bc9f7094f44d7da5616eb68d (patch) | |
| tree | c816a9795d87a06954a463c6e42bd691bc0abc5f | |
| parent | 1cab640962376a9a7db8da1574937d963feb6e1f (diff) | |
| download | haskell-wip/angerman/8.10.5-rollup-2.tar.gz | |
[llvm] Prevent GHC from breaking the test-suitewip/angerman/8.10.5-rollup-2
This breaks lots of tests unnecessarily. The LLVM IR
has been pretty stable since ~7. This stops GHC from
emitting the warnings during the testsuite run.
| -rw-r--r-- | testsuite/driver/testlib.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 3e7b250561..e965b84b04 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -2127,8 +2127,11 @@ def normalise_errmsg(s: str) -> str: # 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) + 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) return s # normalise a .prof file, so that we can reasonably compare it against @@ -2204,6 +2207,10 @@ 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) + 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) + return s def normalise_asm( s: str ) -> str: |