diff options
Diffstat (limited to 'testsuite/tests/ghci/scripts')
| -rw-r--r-- | testsuite/tests/ghci/scripts/Defer02.stderr | 7 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T5979.stderr | 8 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 8 |
3 files changed, 10 insertions, 13 deletions
diff --git a/testsuite/tests/ghci/scripts/Defer02.stderr b/testsuite/tests/ghci/scripts/Defer02.stderr index b2a5efefc3..4888e6958c 100644 --- a/testsuite/tests/ghci/scripts/Defer02.stderr +++ b/testsuite/tests/ghci/scripts/Defer02.stderr @@ -67,9 +67,10 @@ In an equation for ‘j’: j = myOp 23 ../../typecheck/should_run/Defer01.hs:43:10: warning: - No instance for (Num a1) arising from the literal ‘23’ - The type variable ‘a1’ is ambiguous - Potential instances: + Ambiguous type variable ‘a1’ arising from the literal ‘23’ + prevents the constraint ‘(Num a1)’ from being solved. + Probable fix: use a type annotation to specify what ‘a1’ should be. + These potential instances exist: instance Num Integer -- Defined in ‘GHC.Num’ instance Num Double -- Defined in ‘GHC.Float’ instance Num Float -- Defined in ‘GHC.Float’ diff --git a/testsuite/tests/ghci/scripts/T5979.stderr b/testsuite/tests/ghci/scripts/T5979.stderr index b4abfbd99c..cafb6a4992 100644 --- a/testsuite/tests/ghci/scripts/T5979.stderr +++ b/testsuite/tests/ghci/scripts/T5979.stderr @@ -1,7 +1,7 @@ -<no location info>: +<no location info>: error: Could not find module ‘Control.Monad.Trans.State’ Perhaps you meant - Control.Monad.Trans.State (from transformers-<VERSION>@<HASH>) - Control.Monad.Trans.Class (from transformers-<VERSION>@<HASH>) - Control.Monad.Trans.Cont (from transformers-<VERSION>@<HASH>) + Control.Monad.Trans.State (from transformers-0.4.3.0@transformers-0.4.3.0) + Control.Monad.Trans.Class (from transformers-0.4.3.0@transformers-0.4.3.0) + Control.Monad.Trans.Cont (from transformers-0.4.3.0@transformers-0.4.3.0) diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index d2244c1790..d58b2dc0aa 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -1,8 +1,5 @@ # coding=utf8 -def normaliseTransformersPackageKey(str): - return re.sub('transformers-[^@]+@[A-Za-z0-9]+', 'transformers-<VERSION>@<HASH>', str) - setTestOpts(when(compiler_profiled(), skip)) test('ghci001', combined_output, ghci_script, ['ghci001.script']) @@ -126,7 +123,7 @@ test('T5836', normal, ghci_script, ['T5836.script']) test('T5979', [reqlib('transformers'), normalise_slashes, - normalise_errmsg_fun(normaliseTransformersPackageKey)], + normalise_version("transformers")], ghci_script, ['T5979.script']) test('T5975a', [pre_cmd('touch föøbàr1.hs'), @@ -208,8 +205,7 @@ test('T9878', [extra_clean(['T9878.hi','T9878.o'])], ghci_script, ['T9878.script']) test('T9878b', - [ when(opsys('mingw32'), expect_broken(9878)), - extra_run_opts('-fobject-code'), + [ extra_run_opts('-fobject-code'), extra_clean(['T9878b.hi','T9878b.o'])], ghci_script, ['T9878b.script']) test('T10018', normal, ghci_script, ['T10018.script']) |