Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/9c6f0a5f706928a8d3bd6f77ba91734c6bf494c1 >--------------------------------------------------------------- commit 9c6f0a5f706928a8d3bd6f77ba91734c6bf494c1 Author: Ian Lynagh <[email protected]> Date: Sun Sep 25 15:53:12 2011 +0100 Fix ghci038 on Windows It was failing due to quoting differences between Windows and other platforms. >--------------------------------------------------------------- tests/ghci/scripts/ghci038.script | 12 ++++++------ tests/ghci/scripts/ghci038.stdout | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/ghci/scripts/ghci038.script b/tests/ghci/scripts/ghci038.script index 1b01a03..53e1fa5 100644 --- a/tests/ghci/scripts/ghci038.script +++ b/tests/ghci/scripts/ghci038.script @@ -2,19 +2,19 @@ :show imports import Prelude :show imports -:!echo -- map in scope due to explicit 'import Prelude' +:!printf "== map in scope due to explicit 'import Prelude'\n" :t map import Prelude () :show imports -:!echo -- still in scope, 'import Prelude ()' is subsumed by 'import Prelude' +:!printf "== still in scope, 'import Prelude ()' is subsumed by 'import Prelude'\n" :t map :module -Prelude :show imports -:!echo -- still in scope, implicit import of Prelude +:!printf "== still in scope, implicit import of Prelude\n" :t map import Prelude () :show imports -:!echo -- not in scope now +:!printf "== not in scope now\n" :t map :module -Prelude @@ -23,11 +23,11 @@ import Prelude () :t x :show imports -:!echo :m -Foo +:!printf ":m -Foo\n" :m -Foo :show imports :t x -:!echo :m +*Foo +:!printf ":m +*Foo\n" :m +*Foo :show imports :t x diff --git a/tests/ghci/scripts/ghci038.stdout b/tests/ghci/scripts/ghci038.stdout index 94b0613..bd13690 100644 --- a/tests/ghci/scripts/ghci038.stdout +++ b/tests/ghci/scripts/ghci038.stdout @@ -1,15 +1,15 @@ import Prelude -- implicit import Prelude --- map in scope due to explicit import Prelude +== map in scope due to explicit 'import Prelude' map :: (a -> b) -> [a] -> [b] import Prelude --- still in scope, import Prelude () is subsumed by import Prelude +== still in scope, 'import Prelude ()' is subsumed by 'import Prelude' map :: (a -> b) -> [a] -> [b] import Prelude -- implicit --- still in scope, implicit import of Prelude +== still in scope, implicit import of Prelude map :: (a -> b) -> [a] -> [b] import Prelude () --- not in scope now +== not in scope now import Prelude -- implicit x :: (a -> b) -> [a] -> [b] :module +*Foo -- added automatically _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
