diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-02-11 09:18:09 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-06-17 16:22:04 -0400 |
| commit | f817d816e60a487bca64037095c01e9956225b64 (patch) | |
| tree | 7e2779c7e2485539001b3649bea62554b6d924f7 /testsuite/driver | |
| parent | aa9e7b7196f03f84579e3b4a09068c668cbe6ffb (diff) | |
| download | haskell-f817d816e60a487bca64037095c01e9956225b64.tar.gz | |
Update testsuite
* support detection of slow ghc-bignum backend (to replace the detection
of integer-simple use). There are still some test cases that the
native backend doesn't handle efficiently enough.
* remove tests for GMP only functions that have been removed from
ghc-bignum
* fix test results showing dependent packages (e.g. integer-gmp) or
showing suggested instances
* fix test using Integer/Natural API or showing internal names
Diffstat (limited to 'testsuite/driver')
| -rw-r--r-- | testsuite/driver/testglobals.py | 3 | ||||
| -rw-r--r-- | testsuite/driver/testlib.py | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index e20a8329d7..13e22d5329 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -139,6 +139,9 @@ class TestConfig: # Is readelf available? self.have_readelf = False + # Do we use a fast backend for bignum (e.g. GMP) + self.have_fast_bignum = True + # Are we testing an in-tree compiler? self.in_tree_compiler = True diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 95b0983ba0..bce6c1be0f 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -563,11 +563,11 @@ def have_gdb( ) -> bool: def have_readelf( ) -> bool: return config.have_readelf -def integer_gmp( ) -> bool: - return have_library("integer-gmp") +def have_fast_bignum( ) -> bool: + return config.have_fast_bignum -def integer_simple( ) -> bool: - return have_library("integer-simple") +def have_slow_bignum( ) -> bool: + return not(have_fast_bignum()) def llvm_build ( ) -> bool: return config.ghc_built_by_llvm @@ -2143,11 +2143,11 @@ def normalise_errmsg(s: str) -> str: # collisions, so we need to normalise that to just "ghc" s = re.sub('ghc-stage[123]', 'ghc', s) - # Error messages sometimes contain integer implementation package - s = re.sub('integer-(gmp|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', s) + # Error messages sometimes contain ghc-bignum implementation package + s = re.sub('ghc-bignum-[0-9.]+', 'ghc-bignum-<VERSION>', s) # Error messages sometimes contain this blurb which can vary - # spuriously depending upon build configuration (e.g. based on integer + # spuriously depending upon build configuration (e.g. based on bignum # backend) s = re.sub('...plus ([a-z]+|[0-9]+) instances involving out-of-scope types', '...plus N instances involving out-of-scope types', s) |