Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/3373d5fef3eaaecc1aef503cf81aa2ebb7cb8d3a >--------------------------------------------------------------- commit 3373d5fef3eaaecc1aef503cf81aa2ebb7cb8d3a Author: Simon Marlow <[email protected]> Date: Wed Feb 29 15:15:09 2012 +0000 update ghci024 following changes to :set >--------------------------------------------------------------- tests/ghci/scripts/Makefile | 9 +++++---- tests/ghci/scripts/ghci024.stdout | 25 +++++++++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tests/ghci/scripts/Makefile b/tests/ghci/scripts/Makefile index 03d9fc4..1fe7025 100644 --- a/tests/ghci/scripts/Makefile +++ b/tests/ghci/scripts/Makefile @@ -5,16 +5,17 @@ include $(TOP)/mk/test.mk ghci024: @echo "~~~~~~~~~~ Testing :set" printf ":set\n" \ + | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci + @echo "~~~~~~~~~~ Testing :set -a" + printf ":set -a\n" \ | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \ | grep -E "^([^ ]| -fno-print-explicit-foralls| -fno-warn-implicit-prelude)" @echo "~~~~~~~~~~ Testing :show languages" printf ":show languages\n" \ - | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \ - | grep -E "^([^ ]| -XImplicitPrelude| -XMagicHash)" + | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci @echo "~~~~~~~~~~ Testing :show languages, with -XMagicHash" printf ":set -XMagicHash\n:show languages\n" \ - | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \ - | grep -E "^([^ ]| -XImplicitPrelude| -XMagicHash)" + | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci @echo "~~~~~~~~~~ Testing :show packages" printf ":show packages\n" \ | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \ diff --git a/tests/ghci/scripts/ghci024.stdout b/tests/ghci/scripts/ghci024.stdout index 8073383..f6b8cb3 100644 --- a/tests/ghci/scripts/ghci024.stdout +++ b/tests/ghci/scripts/ghci024.stdout @@ -1,17 +1,34 @@ ~~~~~~~~~~ Testing :set options currently set: none. +base language is: Haskell2010 +with the following modifiers: + -XNoDatatypeContexts + -XNondecreasingIndentation +GHCi-specific dynamic flag settings: +other dynamic, non-language, flag settings: + -fforce-recomp + -fimplicit-import-qualified +warning settings: +~~~~~~~~~~ Testing :set -a +options currently set: none. +base language is: Haskell2010 +all active language options: GHCi-specific dynamic flag settings: -fno-print-explicit-foralls other dynamic, non-language, flag settings: warning settings: -fno-warn-implicit-prelude ~~~~~~~~~~ Testing :show languages -active language flags: - -XImplicitPrelude +base language is: Haskell2010 +with the following modifiers: + -XNoDatatypeContexts + -XNondecreasingIndentation ~~~~~~~~~~ Testing :show languages, with -XMagicHash -active language flags: +base language is: Haskell2010 +with the following modifiers: -XMagicHash - -XImplicitPrelude + -XNoDatatypeContexts + -XNondecreasingIndentation ~~~~~~~~~~ Testing :show packages active package flags: none ~~~~~~~~~~ Testing :show packages, including the ghc package _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
