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/tests/ghci.debugger | |
| 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/tests/ghci.debugger')
5 files changed, 11 insertions, 17 deletions
diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T index 12fe420363..aa998adef2 100644 --- a/testsuite/tests/ghci.debugger/scripts/all.T +++ b/testsuite/tests/ghci.debugger/scripts/all.T @@ -45,7 +45,7 @@ test('print033', normal, ghci_script, ['print033.script']) test('print034', extra_files(['../GADT.hs', '../Test.hs']), ghci_script, ['print034.script']) test('print035', extra_files(['../Unboxed.hs']), ghci_script, ['print035.script']) test('print036', expect_broken(9046), ghci_script, ['print036.script']) -test('print037', when(llvm_build() and integer_gmp(), +test('print037', when(llvm_build(), fragile_for(16205, ['ghci-ext'])) , ghci_script , ['print037.script']) diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr index 4622cb53e9..037a834eec 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stderr +++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr @@ -6,10 +6,10 @@ Relevant bindings include it :: a (bound at <interactive>:4:1) These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ ...plus 22 others - ...plus 18 instances involving out-of-scope types + ...plus 12 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it @@ -20,9 +20,9 @@ Relevant bindings include it :: a (bound at <interactive>:6:1) These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ instance Show a => Show (Maybe a) -- Defined in ‘GHC.Show’ + instance Show Integer -- Defined in ‘GHC.Show’ ...plus 22 others - ...plus 18 instances involving out-of-scope types + ...plus 12 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci.debugger/scripts/print002.script b/testsuite/tests/ghci.debugger/scripts/print002.script index 401af2c212..1e56254d94 100644 --- a/testsuite/tests/ghci.debugger/scripts/print002.script +++ b/testsuite/tests/ghci.debugger/scripts/print002.script @@ -5,12 +5,9 @@ let f = Just (1.2::Float) f :p f --- With @integer-gmp@, small integer literals get converted directly into --- @S# 10#@. This optimization means that small integers are always already +-- With @ghc-bignum@, small integer literals get converted directly into +-- @IS 10#@. This optimization means that small integers are always already -- evaluated in the output for @:p@. --- --- Since we want this test to work on @integer-simple@ too, we explicitly --- force the literal. let ten = 10 :: Integer :f ten let i = Just ten diff --git a/testsuite/tests/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr index 5815080f6a..189fc91eab 100644 --- a/testsuite/tests/ghci.debugger/scripts/print019.stderr +++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr @@ -7,8 +7,8 @@ These potential instances exist: instance Show Ordering -- Defined in ‘GHC.Show’ instance Show TyCon -- Defined in ‘GHC.Show’ - instance Show Integer -- Defined in ‘GHC.Show’ + instance Show a => Show (List1 a) -- Defined at Test.hs:11:12 ...plus 29 others - ...plus 19 instances involving out-of-scope types + ...plus 13 instances involving out-of-scope types (use -fprint-potential-instances to see them all) • In a stmt of an interactive GHCi command: print it diff --git a/testsuite/tests/ghci.debugger/scripts/print037.script b/testsuite/tests/ghci.debugger/scripts/print037.script index 7bf332c175..3e2a07f359 100644 --- a/testsuite/tests/ghci.debugger/scripts/print037.script +++ b/testsuite/tests/ghci.debugger/scripts/print037.script @@ -1,11 +1,8 @@ -- Test out printing of integers in GHCi --- With @integer-gmp@, small integer literals get converted directly into --- @S# i#@. This optimization means that small integers are always already +-- With @ghc-bignum@, small integer literals get converted directly into +-- @IS i#@. This optimization means that small integers are always already -- evaluated in the output for @:p@. --- --- Since we want this test to work on @integer-simple@ too, we explicitly --- force the literals. let smallNeg = -53 :: Integer :f smallNeg |