diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-06-16 11:15:11 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-22 10:06:05 -0400 |
| commit | 655c6e265e06acbebcb6f9aa084efb3ce933e189 (patch) | |
| tree | e916c8cfbc01efffa8261e174a5ccc3d723be165 /testsuite/tests/ghci.debugger | |
| parent | e0595d22ce5bc19699079abdb47377b5707cdbbc (diff) | |
| download | haskell-655c6e265e06acbebcb6f9aa084efb3ce933e189.tar.gz | |
ghci: Don't rely on resolution of System.IO to base module
Previously we would hackily evaluate a textual code snippet to compute
actions to disable I/O buffering and flush the stdout/stderr handles.
This broke in a number of ways (#15336, #16563).
Instead we now ship a module (`GHC.GHCi.Helpers`) with `base` containing
the needed actions. We can then easily refer to these via `Orig` names.
Diffstat (limited to 'testsuite/tests/ghci.debugger')
4 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/tests/ghci.debugger/scripts/break006.stdout b/testsuite/tests/ghci.debugger/scripts/break006.stdout index 2b4a6c20f8..407ad3739b 100644 --- a/testsuite/tests/ghci.debugger/scripts/break006.stdout +++ b/testsuite/tests/ghci.debugger/scripts/break006.stdout @@ -4,14 +4,14 @@ f :: Int -> a = _ x :: Int = 1 xs :: [Int] = [2,3] xs :: [Int] = [2,3] -f :: Int -> a = _ x :: Int = 1 +f :: Int -> a = _ _result :: [a] = _ y = (_t1::a) y = 2 xs :: [Int] = [2,3] -f :: Int -> Int = _ x :: Int = 1 +f :: Int -> Int = _ _result :: [Int] = _ y :: Int = 2 _t1 :: Int = 2 diff --git a/testsuite/tests/ghci.debugger/scripts/break013.stdout b/testsuite/tests/ghci.debugger/scripts/break013.stdout index 52aa48ee83..0024bc62d0 100644 --- a/testsuite/tests/ghci.debugger/scripts/break013.stdout +++ b/testsuite/tests/ghci.debugger/scripts/break013.stdout @@ -3,7 +3,7 @@ _result :: (Bool, Bool, ()) = _ a :: Bool = _ b :: Bool = _ c :: () = _ -b :: Bool = _ c :: () = _ +b :: Bool = _ a :: Bool = _ _result :: (Bool, Bool, ()) = _ diff --git a/testsuite/tests/ghci.debugger/scripts/hist001.stdout b/testsuite/tests/ghci.debugger/scripts/hist001.stdout index b52e8aa5fe..a19a34f315 100644 --- a/testsuite/tests/ghci.debugger/scripts/hist001.stdout +++ b/testsuite/tests/ghci.debugger/scripts/hist001.stdout @@ -20,8 +20,8 @@ _result :: a f :: Integer -> a x :: Integer xs :: [t] = [] -f :: Integer -> a = _ x :: Integer = 2 +f :: Integer -> a = _ _result :: a = _ _result = 3 Logged breakpoint at Test3.hs:2:18-31 diff --git a/testsuite/tests/ghci.debugger/scripts/hist002.stdout b/testsuite/tests/ghci.debugger/scripts/hist002.stdout index b52e8aa5fe..a19a34f315 100644 --- a/testsuite/tests/ghci.debugger/scripts/hist002.stdout +++ b/testsuite/tests/ghci.debugger/scripts/hist002.stdout @@ -20,8 +20,8 @@ _result :: a f :: Integer -> a x :: Integer xs :: [t] = [] -f :: Integer -> a = _ x :: Integer = 2 +f :: Integer -> a = _ _result :: a = _ _result = 3 Logged breakpoint at Test3.hs:2:18-31 |