From 60f3bf460d94892f343cea30dd43f3863c8f30fb Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 23 Jul 2003 11:43:21 +0000 Subject: [PATCH] [project @ 2003-07-23 11:43:16 by simonmar] These test have all moved over to fptools/testsuite/tests/ghc-regress/ghci. The old test suite in fptools/ghc/tests is now finally dead! --- ghc/tests/Makefile | 24 ------- ghc/tests/ghci/Makefile | 9 --- ghc/tests/ghci/ghci001.script | 3 - ghc/tests/ghci/ghci001.stdout | 13 ---- ghc/tests/ghci/ghci002.script | 4 -- ghc/tests/ghci/ghci002.stdout | 14 ---- ghc/tests/ghci/ghci003.script | 7 -- ghc/tests/ghci/ghci003.stdout | 20 ------ ghc/tests/ghci/ghci004.hs | 2 - ghc/tests/ghci/ghci004.script | 4 -- ghc/tests/ghci/ghci004.stderr | 1 - ghc/tests/ghci/ghci004.stdout | 14 ---- ghc/tests/ghci/ghci005.script | 13 ---- ghc/tests/ghci/ghci005.stdout | 25 ------- ghc/tests/ghci/ghci006.hs | 8 --- ghc/tests/ghci/ghci006.script | 6 -- ghc/tests/ghci/ghci006.stderr | 1 - ghc/tests/ghci/ghci006.stdout | 16 ----- ghc/tests/ghci/ghci007.script | 2 - ghc/tests/ghci/ghci007.stdout | 11 --- ghc/tests/ghci/ghci008.script | 10 --- ghc/tests/ghci/ghci008.stdout | 66 ------------------ ghc/tests/ghci/ghci009.script | 20 ------ ghc/tests/ghci/ghci009.stdout | 36 ---------- ghc/tests/ghci/ghci010.script | 3 - ghc/tests/ghci/ghci010.stdout | 14 ---- ghc/tests/ghci/prog001/A.hs | 5 -- ghc/tests/ghci/prog001/B.hs | 5 -- ghc/tests/ghci/prog001/C.hs | 9 --- ghc/tests/ghci/prog001/D.hs | 5 -- ghc/tests/ghci/prog001/D1.hs | 5 -- ghc/tests/ghci/prog001/D2.hs | 5 -- ghc/tests/ghci/prog001/Makefile | 7 -- ghc/tests/ghci/prog001/prog001.script | 36 ---------- ghc/tests/ghci/prog001/prog001.stderr | 15 ----- ghc/tests/ghci/prog001/prog001.stdout | 54 --------------- ghc/tests/ghci/prog002/A.hs | 6 -- ghc/tests/ghci/prog002/A1.hs | 6 -- ghc/tests/ghci/prog002/A2.hs | 6 -- ghc/tests/ghci/prog002/B.hs | 7 -- ghc/tests/ghci/prog002/C.hs | 5 -- ghc/tests/ghci/prog002/D.hs | 5 -- ghc/tests/ghci/prog002/Makefile | 7 -- ghc/tests/ghci/prog002/prog002.script | 40 ----------- ghc/tests/ghci/prog002/prog002.stderr | 16 ----- ghc/tests/ghci/prog002/prog002.stdout | 65 ------------------ ghc/tests/ghci/prog003/A.hs | 8 --- ghc/tests/ghci/prog003/B.hs | 5 -- ghc/tests/ghci/prog003/C.hs | 5 -- ghc/tests/ghci/prog003/D.hs | 13 ---- ghc/tests/ghci/prog003/D1.hs | 13 ---- ghc/tests/ghci/prog003/D2.hs | 13 ---- ghc/tests/ghci/prog003/Makefile | 7 -- ghc/tests/ghci/prog003/prog003.script | 76 --------------------- ghc/tests/ghci/prog003/prog003.stderr | 46 ------------- ghc/tests/ghci/prog003/prog003.stdout | 120 --------------------------------- ghc/tests/ghci/prog004/AA.hs | 2 - ghc/tests/ghci/prog004/BB.hs | 3 - ghc/tests/ghci/prog004/Main.hs | 3 - ghc/tests/ghci/prog004/Makefile | 7 -- ghc/tests/ghci/prog004/YY.hs | 3 - ghc/tests/ghci/prog004/ZZ.hs | 3 - ghc/tests/ghci/prog004/prog004.stdout | 1 - ghc/tests/mk/boilerplate.mk | 35 ---------- ghc/tests/mk/ghci.mk | 17 ----- ghc/tests/mk/should_compile.mk | 27 -------- ghc/tests/mk/should_fail.mk | 18 ----- ghc/tests/mk/should_run.mk | 20 ------ ghc/tests/mk/target.mk | 10 --- 69 files changed, 1110 deletions(-) delete mode 100644 ghc/tests/Makefile delete mode 100644 ghc/tests/ghci/Makefile delete mode 100644 ghc/tests/ghci/ghci001.script delete mode 100644 ghc/tests/ghci/ghci001.stdout delete mode 100644 ghc/tests/ghci/ghci002.script delete mode 100644 ghc/tests/ghci/ghci002.stdout delete mode 100644 ghc/tests/ghci/ghci003.script delete mode 100644 ghc/tests/ghci/ghci003.stdout delete mode 100644 ghc/tests/ghci/ghci004.hs delete mode 100644 ghc/tests/ghci/ghci004.script delete mode 100644 ghc/tests/ghci/ghci004.stderr delete mode 100644 ghc/tests/ghci/ghci004.stdout delete mode 100644 ghc/tests/ghci/ghci005.script delete mode 100644 ghc/tests/ghci/ghci005.stdout delete mode 100644 ghc/tests/ghci/ghci006.hs delete mode 100644 ghc/tests/ghci/ghci006.script delete mode 100644 ghc/tests/ghci/ghci006.stderr delete mode 100644 ghc/tests/ghci/ghci006.stdout delete mode 100644 ghc/tests/ghci/ghci007.script delete mode 100644 ghc/tests/ghci/ghci007.stdout delete mode 100644 ghc/tests/ghci/ghci008.script delete mode 100644 ghc/tests/ghci/ghci008.stdout delete mode 100644 ghc/tests/ghci/ghci009.script delete mode 100644 ghc/tests/ghci/ghci009.stdout delete mode 100644 ghc/tests/ghci/ghci010.script delete mode 100644 ghc/tests/ghci/ghci010.stdout delete mode 100644 ghc/tests/ghci/prog001/A.hs delete mode 100644 ghc/tests/ghci/prog001/B.hs delete mode 100644 ghc/tests/ghci/prog001/C.hs delete mode 100644 ghc/tests/ghci/prog001/D.hs delete mode 100644 ghc/tests/ghci/prog001/D1.hs delete mode 100644 ghc/tests/ghci/prog001/D2.hs delete mode 100644 ghc/tests/ghci/prog001/Makefile delete mode 100644 ghc/tests/ghci/prog001/prog001.script delete mode 100644 ghc/tests/ghci/prog001/prog001.stderr delete mode 100644 ghc/tests/ghci/prog001/prog001.stdout delete mode 100644 ghc/tests/ghci/prog002/A.hs delete mode 100644 ghc/tests/ghci/prog002/A1.hs delete mode 100644 ghc/tests/ghci/prog002/A2.hs delete mode 100644 ghc/tests/ghci/prog002/B.hs delete mode 100644 ghc/tests/ghci/prog002/C.hs delete mode 100644 ghc/tests/ghci/prog002/D.hs delete mode 100644 ghc/tests/ghci/prog002/Makefile delete mode 100644 ghc/tests/ghci/prog002/prog002.script delete mode 100644 ghc/tests/ghci/prog002/prog002.stderr delete mode 100644 ghc/tests/ghci/prog002/prog002.stdout delete mode 100644 ghc/tests/ghci/prog003/A.hs delete mode 100644 ghc/tests/ghci/prog003/B.hs delete mode 100644 ghc/tests/ghci/prog003/C.hs delete mode 100644 ghc/tests/ghci/prog003/D.hs delete mode 100644 ghc/tests/ghci/prog003/D1.hs delete mode 100644 ghc/tests/ghci/prog003/D2.hs delete mode 100644 ghc/tests/ghci/prog003/Makefile delete mode 100644 ghc/tests/ghci/prog003/prog003.script delete mode 100644 ghc/tests/ghci/prog003/prog003.stderr delete mode 100644 ghc/tests/ghci/prog003/prog003.stdout delete mode 100644 ghc/tests/ghci/prog004/AA.hs delete mode 100644 ghc/tests/ghci/prog004/BB.hs delete mode 100644 ghc/tests/ghci/prog004/Main.hs delete mode 100644 ghc/tests/ghci/prog004/Makefile delete mode 100644 ghc/tests/ghci/prog004/YY.hs delete mode 100644 ghc/tests/ghci/prog004/ZZ.hs delete mode 100644 ghc/tests/ghci/prog004/prog004.stdout delete mode 100644 ghc/tests/mk/boilerplate.mk delete mode 100644 ghc/tests/mk/ghci.mk delete mode 100644 ghc/tests/mk/should_compile.mk delete mode 100644 ghc/tests/mk/should_fail.mk delete mode 100644 ghc/tests/mk/should_run.mk delete mode 100644 ghc/tests/mk/target.mk diff --git a/ghc/tests/Makefile b/ghc/tests/Makefile deleted file mode 100644 index 30abd04..0000000 --- a/ghc/tests/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -TOP = . -include $(TOP)/mk/boilerplate.mk - -SUBDIRS = \ - array \ - ccall \ - codeGen \ - concurrent \ - deSugar \ - deriving \ - io \ - lib \ - numeric \ - reader \ - rename \ - simplCore \ - stranal \ - typecheck \ - programs - -# printing \ - -include $(TOP)/mk/target.mk - diff --git a/ghc/tests/ghci/Makefile b/ghc/tests/ghci/Makefile deleted file mode 100644 index 0af21c6..0000000 --- a/ghc/tests/ghci/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: Makefile,v 1.1 2001/03/01 15:36:20 simonmar Exp $ - -TOP = .. -include $(TOP)/mk/boilerplate.mk - -SUBDIRS=$(wildcard prog*/) - -include $(TOP)/mk/ghci.mk diff --git a/ghc/tests/ghci/ghci001.script b/ghc/tests/ghci/ghci001.script deleted file mode 100644 index 0902a0c..0000000 --- a/ghc/tests/ghci/ghci001.script +++ /dev/null @@ -1,3 +0,0 @@ --- bug: shouldn't be defaulting these expressions -:type (+) -:type enumFromTo diff --git a/ghc/tests/ghci/ghci001.stdout b/ghc/tests/ghci/ghci001.stdout deleted file mode 100644 index 4a86ff5..0000000 --- a/ghc/tests/ghci/ghci001.stdout +++ /dev/null @@ -1,13 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- bug: shouldn't be defaulting these expressions -Prelude> :type (+) -forall a. (Num a) => a -> a -> a -Prelude> :type enumFromTo -forall a. (Enum a) => a -> a -> [a] -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci002.script b/ghc/tests/ghci/ghci002.script deleted file mode 100644 index a943f77..0000000 --- a/ghc/tests/ghci/ghci002.script +++ /dev/null @@ -1,4 +0,0 @@ --- bug: we used to throw away the instance accidentally here -:m PrelBase -1 == (2 :: Int) -1 == (2 :: Int) diff --git a/ghc/tests/ghci/ghci002.stdout b/ghc/tests/ghci/ghci002.stdout deleted file mode 100644 index 33aaac6..0000000 --- a/ghc/tests/ghci/ghci002.stdout +++ /dev/null @@ -1,14 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- bug: we used to throw away the instance accidentally here -Prelude> :m PrelBase -PrelBase> 1 == (2 :: Int) -False -PrelBase> 1 == (2 :: Int) -False -PrelBase> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci003.script b/ghc/tests/ghci/ghci003.script deleted file mode 100644 index 08d0114..0000000 --- a/ghc/tests/ghci/ghci003.script +++ /dev/null @@ -1,7 +0,0 @@ --- check that 'it' works -1 -it -print it -return 42 -it -print it diff --git a/ghc/tests/ghci/ghci003.stdout b/ghc/tests/ghci/ghci003.stdout deleted file mode 100644 index f20411b..0000000 --- a/ghc/tests/ghci/ghci003.stdout +++ /dev/null @@ -1,20 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- check that 'it' works -Prelude> 1 -1 -Prelude> it -1 -Prelude> print it -1 -Prelude> return 42 -Prelude> it -42 -Prelude> print it -42 -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci004.hs b/ghc/tests/ghci/ghci004.hs deleted file mode 100644 index 292905c..0000000 --- a/ghc/tests/ghci/ghci004.hs +++ /dev/null @@ -1,2 +0,0 @@ -import List -main = print (sort [100,99..1]) diff --git a/ghc/tests/ghci/ghci004.script b/ghc/tests/ghci/ghci004.script deleted file mode 100644 index 4949629..0000000 --- a/ghc/tests/ghci/ghci004.script +++ /dev/null @@ -1,4 +0,0 @@ -:unset +s +t --- test importing a module from a package -:l ghci004 -main diff --git a/ghc/tests/ghci/ghci004.stderr b/ghc/tests/ghci/ghci004.stderr deleted file mode 100644 index 89f2519..0000000 --- a/ghc/tests/ghci/ghci004.stderr +++ /dev/null @@ -1 +0,0 @@ -Compiling Main ( ghci004.hs, interpreted ) diff --git a/ghc/tests/ghci/ghci004.stdout b/ghc/tests/ghci/ghci004.stdout deleted file mode 100644 index effcd17..0000000 --- a/ghc/tests/ghci/ghci004.stdout +++ /dev/null @@ -1,14 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> :unset +s +t -Prelude> -- test importing a module from a package -Prelude> :l ghci004 -Ok, modules loaded: Main. -Main> main -[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100] -Main> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci005.script b/ghc/tests/ghci/ghci005.script deleted file mode 100644 index f25481d..0000000 --- a/ghc/tests/ghci/ghci005.script +++ /dev/null @@ -1,13 +0,0 @@ -:unset +s +t --- tests for :def, :undef -let void m = m >> return "" -let echo s = void (putStrLn s) -:def echo echo -:echo hello, world! - -let echo s = return (":! echo " ++ map Char.toUpper s) -:echo hello, world! -:def echo echo -:undef echo -:def echo echo -:echo hello, world! diff --git a/ghc/tests/ghci/ghci005.stdout b/ghc/tests/ghci/ghci005.stdout deleted file mode 100644 index dbec13f..0000000 --- a/ghc/tests/ghci/ghci005.stdout +++ /dev/null @@ -1,25 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> :unset +s +t -Prelude> -- tests for :def, :undef -Prelude> let void m = m >> return "" -Prelude> let echo s = void (putStrLn s) -Prelude> :def echo echo -Prelude> :echo hello, world! -hello, world! -Prelude> -Prelude> let echo s = return (":! echo " ++ map Char.toUpper s) -Prelude> :echo hello, world! -hello, world! -Prelude> :def echo echo -command `echo' is already defined -Prelude> :undef echo -Prelude> :def echo echo -Prelude> :echo hello, world! -HELLO, WORLD! -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci006.hs b/ghc/tests/ghci/ghci006.hs deleted file mode 100644 index c1bef51..0000000 --- a/ghc/tests/ghci/ghci006.hs +++ /dev/null @@ -1,8 +0,0 @@ - -module Ghci006 where - -data Q = forall x . Show x => Q x -showQ (Q x) = show x - --- associated bug is that at the interpreter command line, --- showQ (Q "foo") crashed the interpreter. diff --git a/ghc/tests/ghci/ghci006.script b/ghc/tests/ghci/ghci006.script deleted file mode 100644 index b768567..0000000 --- a/ghc/tests/ghci/ghci006.script +++ /dev/null @@ -1,6 +0,0 @@ -:unset +s +t -:set -fglasgow-exts --- test for contexts on existential types crashing the interpreter -:l ghci006 -showQ (Q "foo") - diff --git a/ghc/tests/ghci/ghci006.stderr b/ghc/tests/ghci/ghci006.stderr deleted file mode 100644 index 75eb459..0000000 --- a/ghc/tests/ghci/ghci006.stderr +++ /dev/null @@ -1 +0,0 @@ -Compiling Ghci006 ( ghci006.hs, interpreted ) diff --git a/ghc/tests/ghci/ghci006.stdout b/ghc/tests/ghci/ghci006.stdout deleted file mode 100644 index ae8da90..0000000 --- a/ghc/tests/ghci/ghci006.stdout +++ /dev/null @@ -1,16 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> :unset +s +t -Prelude> :set -fglasgow-exts -Prelude> -- test for contexts on existential types crashing the interpreter -Prelude> :l ghci006 -Ok, modules loaded: Ghci006. -Ghci006> showQ (Q "foo") -"\"foo\"" -Ghci006> -Ghci006> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci007.script b/ghc/tests/ghci/ghci007.script deleted file mode 100644 index 31ece83..0000000 --- a/ghc/tests/ghci/ghci007.script +++ /dev/null @@ -1,2 +0,0 @@ --- bug: shouldn't kill the whole system -System.exitFailure diff --git a/ghc/tests/ghci/ghci007.stdout b/ghc/tests/ghci/ghci007.stdout deleted file mode 100644 index 9df37f6..0000000 --- a/ghc/tests/ghci/ghci007.stdout +++ /dev/null @@ -1,11 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- bug: shouldn't kill the whole system -Prelude> System.exitFailure -*** Exception: exit: ExitFailure 1 -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci008.script b/ghc/tests/ghci/ghci008.script deleted file mode 100644 index 1daf837..0000000 --- a/ghc/tests/ghci/ghci008.script +++ /dev/null @@ -1,10 +0,0 @@ --- testing :info -:info + -:info (+) -:info Complex.:+ -:info (Complex.:+) -:info RealFloat -:info [] -:info () -:info (,) -:info `List.isPrefixOf` diff --git a/ghc/tests/ghci/ghci008.stdout b/ghc/tests/ghci/ghci008.stdout deleted file mode 100644 index 5db5463..0000000 --- a/ghc/tests/ghci/ghci008.stdout +++ /dev/null @@ -1,66 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- testing :info -Prelude> :info + --- + is a method in class Num -infixl 6 + -(+) :: forall a. (Num a) => a -> a -> a -Prelude> :info (+) --- + is a method in class Num -infixl 6 + -(+) :: forall a. (Num a) => a -> a -> a -Prelude> :info Complex.:+ --- Complex.:+ is a data constructor -infix 6 Complex.:+ -(Complex.:+) :: forall a. (RealFloat a) => - a -> a -> Complex.Complex a -Prelude> :info (Complex.:+) --- Complex.:+ is a data constructor -infix 6 Complex.:+ -(Complex.:+) :: forall a. (RealFloat a) => - a -> a -> Complex.Complex a -Prelude> :info RealFloat --- RealFloat is a class -class (RealFrac a, Floating a) => RealFloat a where { - floatRadix :: a -> Integer; - floatDigits :: a -> Int; - floatRange :: a -> (Int, Int); - decodeFloat :: a -> (Integer, Int); - encodeFloat :: Integer -> Int -> a; - exponent :: a -> Int {- has default method -}; - significand :: a -> a {- has default method -}; - scaleFloat :: Int -> a -> a {- has default method -}; - isInfinite :: a -> Bool; - isDenormalized :: a -> Bool; - isNegativeZero :: a -> Bool; - isIEEE :: a -> Bool; - isNaN :: a -> Bool; - atan2 :: a -> a -> a {- has default method -}; - } -Prelude> :info [] --- [] is a data constructor -[] :: forall a. [a] - --- [] is a type constructor -data [] a = [] | (:) a [a] -Prelude> :info () --- () is a data constructor -() :: () - --- () is a type constructor -data () = () -Prelude> :info (,) --- (,) is a data constructor -(,) :: forall a b. a -> b -> (a, b) - --- (,) is a type constructor -data (,) a b = (,) a b -Prelude> :info `List.isPrefixOf` --- List.isPrefixOf is a variable -List.isPrefixOf :: forall a. (Eq a) => [a] -> [a] -> Bool -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci009.script b/ghc/tests/ghci/ghci009.script deleted file mode 100644 index 687e338..0000000 --- a/ghc/tests/ghci/ghci009.script +++ /dev/null @@ -1,20 +0,0 @@ --- !!! test `:set args' and `:set prog' -System.getArgs -print it -System.getProgName -print it -:set args -System.getArgs -print it -System.getProgName -print it -:set args foo bar -System.getArgs -print it -System.getProgName -print it -:set prog foo -System.getArgs -print it -System.getProgName -print it diff --git a/ghc/tests/ghci/ghci009.stdout b/ghc/tests/ghci/ghci009.stdout deleted file mode 100644 index 4dd7111..0000000 --- a/ghc/tests/ghci/ghci009.stdout +++ /dev/null @@ -1,36 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- !!! test `:set args' and `:set prog' -Prelude> System.getArgs -Prelude> print it -[] -Prelude> System.getProgName -Prelude> print it -"" -Prelude> :set args -Prelude> System.getArgs -Prelude> print it -[] -Prelude> System.getProgName -Prelude> print it -"" -Prelude> :set args foo bar -Prelude> System.getArgs -Prelude> print it -["foo","bar"] -Prelude> System.getProgName -Prelude> print it -"" -Prelude> :set prog foo -Prelude> System.getArgs -Prelude> print it -["foo","bar"] -Prelude> System.getProgName -Prelude> print it -"foo" -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/ghci010.script b/ghc/tests/ghci/ghci010.script deleted file mode 100644 index ab08202..0000000 --- a/ghc/tests/ghci/ghci010.script +++ /dev/null @@ -1,3 +0,0 @@ --- !!! check we can detect deadlock -:set -package concurrent -Concurrent.newEmptyMVar >>= Concurrent.takeMVar diff --git a/ghc/tests/ghci/ghci010.stdout b/ghc/tests/ghci/ghci010.stdout deleted file mode 100644 index b0be06f..0000000 --- a/ghc/tests/ghci/ghci010.stdout +++ /dev/null @@ -1,14 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> -- !!! check we can detect deadlock -Prelude> :set -package concurrent -Loading package lang ... linking ... done. -Loading package concurrent ... linking ... done. -Prelude> Concurrent.newEmptyMVar >>= Concurrent.takeMVar -Deadlocked. -Prelude> Leaving GHCi. diff --git a/ghc/tests/ghci/prog001/A.hs b/ghc/tests/ghci/prog001/A.hs deleted file mode 100644 index ca0a7e8..0000000 --- a/ghc/tests/ghci/prog001/A.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Main where - -import B - -main = print ("hello world" ++ show (f 42)) diff --git a/ghc/tests/ghci/prog001/B.hs b/ghc/tests/ghci/prog001/B.hs deleted file mode 100644 index e57c31f..0000000 --- a/ghc/tests/ghci/prog001/B.hs +++ /dev/null @@ -1,5 +0,0 @@ -module B (module B, module C) where - -import C - -k x = x `mod` 11 diff --git a/ghc/tests/ghci/prog001/C.hs b/ghc/tests/ghci/prog001/C.hs deleted file mode 100644 index 006014f..0000000 --- a/ghc/tests/ghci/prog001/C.hs +++ /dev/null @@ -1,9 +0,0 @@ -module C (f, g, h) where - -import D - -g x = f x + 1 - -h x = x `div` 2 - -data C = C {x :: Int} diff --git a/ghc/tests/ghci/prog001/D.hs b/ghc/tests/ghci/prog001/D.hs deleted file mode 100644 index 997171c..0000000 --- a/ghc/tests/ghci/prog001/D.hs +++ /dev/null @@ -1,5 +0,0 @@ -module D where - -data T = A Int | B Float deriving Eq - -f x = x + 1 diff --git a/ghc/tests/ghci/prog001/D1.hs b/ghc/tests/ghci/prog001/D1.hs deleted file mode 100644 index 35184c7..0000000 --- a/ghc/tests/ghci/prog001/D1.hs +++ /dev/null @@ -1,5 +0,0 @@ -module D where - -data T = A Int | B Float deriving Eq - -f x = x + x diff --git a/ghc/tests/ghci/prog001/D2.hs b/ghc/tests/ghci/prog001/D2.hs deleted file mode 100644 index 997171c..0000000 --- a/ghc/tests/ghci/prog001/D2.hs +++ /dev/null @@ -1,5 +0,0 @@ -module D where - -data T = A Int | B Float deriving Eq - -f x = x + 1 diff --git a/ghc/tests/ghci/prog001/Makefile b/ghc/tests/ghci/prog001/Makefile deleted file mode 100644 index fd68eaf..0000000 --- a/ghc/tests/ghci/prog001/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: Makefile,v 1.1 2001/03/01 15:36:20 simonmar Exp $ - -TOP = ../.. -include $(TOP)/mk/boilerplate.mk - -include $(TOP)/mk/ghci.mk diff --git a/ghc/tests/ghci/prog001/prog001.script b/ghc/tests/ghci/prog001/prog001.script deleted file mode 100644 index 2479e42..0000000 --- a/ghc/tests/ghci/prog001/prog001.script +++ /dev/null @@ -1,36 +0,0 @@ -:unset +s --- first, tidy up: -:! rm -f *.hi *.o *~ -:! cp D1.hs D.hs - --- load the program (all interpreted) -:load A - --- reloading should do nothing -:reload - --- make sure `main' works -main - --- touch a module + recompile -:! sleep 1 -:! touch C.hs -:reload - --- make sure `main' still works -main - --- compile D & reload -:! $HC $HC_OPTS -no-recomp -c D.hs -:reload -main - --- change D, recompile & reload -:! cp D2.hs D.hs -:! $HC $HC_OPTS -no-recomp -c D.hs -:reload -:load A - --- make sure we're picking up the new D, via B -:module B -g 42 diff --git a/ghc/tests/ghci/prog001/prog001.stderr b/ghc/tests/ghci/prog001/prog001.stderr deleted file mode 100644 index efb352f..0000000 --- a/ghc/tests/ghci/prog001/prog001.stderr +++ /dev/null @@ -1,15 +0,0 @@ -Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Skipping B ( B.hs, interpreted ) -Skipping Main ( A.hs, interpreted ) -Compiling D ( D.hs, interpreted ) -Skipping C ( C.hs, interpreted ) -Skipping B ( B.hs, interpreted ) -Skipping Main ( A.hs, interpreted ) -Skipping D ( D.hs, D.o ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) diff --git a/ghc/tests/ghci/prog001/prog001.stdout b/ghc/tests/ghci/prog001/prog001.stdout deleted file mode 100644 index bd9b24a..0000000 --- a/ghc/tests/ghci/prog001/prog001.stdout +++ /dev/null @@ -1,54 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> :unset +s -Prelude> -- first, tidy up: -Prelude> :! rm -f *.hi *.o *~ -Prelude> :! cp D1.hs D.hs -Prelude> -Prelude> -- load the program (all interpreted) -Prelude> :load A -Ok, modules loaded: Main, B, C, D. -Main> -Main> -- reloading should do nothing -Main> :reload -Ok, modules loaded: Main, B, C, D. -Main> -Main> -- make sure `main' works -Main> main -"hello world84" -Main> -Main> -- touch a module + recompile -Main> :! sleep 1 -Main> :! touch C.hs -Main> :reload -Ok, modules loaded: Main, B, C, D. -Main> -Main> -- make sure `main' still works -Main> main -"hello world84" -Main> -Main> -- compile D & reload -Main> :! $HC $HC_OPTS -no-recomp -c D.hs -Main> :reload -Ok, modules loaded: Main, B, C, D. -Main> main -"hello world84" -Main> -Main> -- change D, recompile & reload -Main> :! cp D2.hs D.hs -Main> :! $HC $HC_OPTS -no-recomp -c D.hs -Main> :reload -Ok, modules loaded: Main, B, C, D. -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> -Main> -- make sure we're picking up the new D, via B -Main> :module B -B> g 42 -44 -B> Leaving GHCi. diff --git a/ghc/tests/ghci/prog002/A.hs b/ghc/tests/ghci/prog002/A.hs deleted file mode 100644 index 6dc493a..0000000 --- a/ghc/tests/ghci/prog002/A.hs +++ /dev/null @@ -1,6 +0,0 @@ -module A where - -data T = A Int | B Float deriving Eq - -f :: Int -> Int -f x = x + 3 diff --git a/ghc/tests/ghci/prog002/A1.hs b/ghc/tests/ghci/prog002/A1.hs deleted file mode 100644 index 069e8ef..0000000 --- a/ghc/tests/ghci/prog002/A1.hs +++ /dev/null @@ -1,6 +0,0 @@ -module A where - -data T = A Int | B Float deriving Eq - -f :: Double -> Double -f x = x + x diff --git a/ghc/tests/ghci/prog002/A2.hs b/ghc/tests/ghci/prog002/A2.hs deleted file mode 100644 index 6dc493a..0000000 --- a/ghc/tests/ghci/prog002/A2.hs +++ /dev/null @@ -1,6 +0,0 @@ -module A where - -data T = A Int | B Float deriving Eq - -f :: Int -> Int -f x = x + 3 diff --git a/ghc/tests/ghci/prog002/B.hs b/ghc/tests/ghci/prog002/B.hs deleted file mode 100644 index 6aced23..0000000 --- a/ghc/tests/ghci/prog002/B.hs +++ /dev/null @@ -1,7 +0,0 @@ -module B (f, g, h) where - -import A - -g x = f x + 1 - -h x = x `div` 2 diff --git a/ghc/tests/ghci/prog002/C.hs b/ghc/tests/ghci/prog002/C.hs deleted file mode 100644 index b3baac2..0000000 --- a/ghc/tests/ghci/prog002/C.hs +++ /dev/null @@ -1,5 +0,0 @@ -module C (module B, module C) where - -import B - -k x = x `mod` 11 diff --git a/ghc/tests/ghci/prog002/D.hs b/ghc/tests/ghci/prog002/D.hs deleted file mode 100644 index 35672bd..0000000 --- a/ghc/tests/ghci/prog002/D.hs +++ /dev/null @@ -1,5 +0,0 @@ -module Main where - -import C - -main = print ("hello world" ++ show (f 42)) diff --git a/ghc/tests/ghci/prog002/Makefile b/ghc/tests/ghci/prog002/Makefile deleted file mode 100644 index fd68eaf..0000000 --- a/ghc/tests/ghci/prog002/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: Makefile,v 1.1 2001/03/01 15:36:20 simonmar Exp $ - -TOP = ../.. -include $(TOP)/mk/boilerplate.mk - -include $(TOP)/mk/ghci.mk diff --git a/ghc/tests/ghci/prog002/prog002.script b/ghc/tests/ghci/prog002/prog002.script deleted file mode 100644 index 5f9b8bb..0000000 --- a/ghc/tests/ghci/prog002/prog002.script +++ /dev/null @@ -1,40 +0,0 @@ -:unset +s -:unset +t --- first, clean up: -:! rm -f *.hi *.o *~ -:! cp A1.hs A.hs - -:load D - --- compile A & reload -:! $HC $HC_OPTS -no-recomp -c A.hs -:reload - -B.g 42 -B.g 42 -B.g 42 - --- swap A2 for A, compile & reload -:! cp A2.hs A.hs -:! $HC $HC_OPTS -no-recomp -c A.hs -:reload --- the system should ignore the compiled version and compile its own. - -B.g 42 -B.g 42 -B.g 42 - --- pick up newly compiled A -:load D - -B.g 42 -B.g 42 -B.g 42 - --- remove A.o: system should recompile A -:! rm A.o -:reload - -B.g 42 -B.g 42 -B.g 42 diff --git a/ghc/tests/ghci/prog002/prog002.stderr b/ghc/tests/ghci/prog002/prog002.stderr deleted file mode 100644 index f5d782d..0000000 --- a/ghc/tests/ghci/prog002/prog002.stderr +++ /dev/null @@ -1,16 +0,0 @@ -Compiling A ( A.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling Main ( D.hs, interpreted ) -Compiling A ( A.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling Main ( D.hs, interpreted ) -Skipping A ( A.hs, A.o ) -Compiling B ( B.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling Main ( D.hs, interpreted ) -Compiling A ( A.hs, interpreted ) -Skipping B ( B.hs, interpreted ) -Skipping C ( C.hs, interpreted ) -Skipping Main ( D.hs, interpreted ) diff --git a/ghc/tests/ghci/prog002/prog002.stdout b/ghc/tests/ghci/prog002/prog002.stdout deleted file mode 100644 index 50b8739..0000000 --- a/ghc/tests/ghci/prog002/prog002.stdout +++ /dev/null @@ -1,65 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> :unset +s -Prelude> :unset +t -Prelude> -- first, clean up: -Prelude> :! rm -f *.hi *.o *~ -Prelude> :! cp A1.hs A.hs -Prelude> -Prelude> :load D -Ok, modules loaded: Main, C, B, A. -Main> -Main> -- compile A & reload -Main> :! $HC $HC_OPTS -no-recomp -c A.hs -Main> :reload -Ok, modules loaded: Main, C, B, A. -Main> -Main> B.g 42 -85.0 -Main> B.g 42 -85.0 -Main> B.g 42 -85.0 -Main> -Main> -- swap A2 for A, compile & reload -Main> :! cp A2.hs A.hs -Main> :! $HC $HC_OPTS -no-recomp -c A.hs -Main> :reload -Ok, modules loaded: Main, C, B, A. -Main> -- the system should ignore the compiled version and compile its own. -Main> -Main> B.g 42 -46 -Main> B.g 42 -46 -Main> B.g 42 -46 -Main> -Main> -- pick up newly compiled A -Main> :load D -Ok, modules loaded: Main, C, B, A. -Main> -Main> B.g 42 -46 -Main> B.g 42 -46 -Main> B.g 42 -46 -Main> -Main> -- remove A.o: system should recompile A -Main> :! rm A.o -Main> :reload -Ok, modules loaded: Main, C, B, A. -Main> -Main> B.g 42 -46 -Main> B.g 42 -46 -Main> B.g 42 -46 -Main> Leaving GHCi. diff --git a/ghc/tests/ghci/prog003/A.hs b/ghc/tests/ghci/prog003/A.hs deleted file mode 100644 index 855379c..0000000 --- a/ghc/tests/ghci/prog003/A.hs +++ /dev/null @@ -1,8 +0,0 @@ -module Main(main,a) where - -import B -import C - -main = print (a 42) - -a x = b x + c x diff --git a/ghc/tests/ghci/prog003/B.hs b/ghc/tests/ghci/prog003/B.hs deleted file mode 100644 index cd57965..0000000 --- a/ghc/tests/ghci/prog003/B.hs +++ /dev/null @@ -1,5 +0,0 @@ -module B where - -import D - -b x = d x diff --git a/ghc/tests/ghci/prog003/C.hs b/ghc/tests/ghci/prog003/C.hs deleted file mode 100644 index 7d8df58..0000000 --- a/ghc/tests/ghci/prog003/C.hs +++ /dev/null @@ -1,5 +0,0 @@ -module C where - -import D - -c x = d x diff --git a/ghc/tests/ghci/prog003/D.hs b/ghc/tests/ghci/prog003/D.hs deleted file mode 100644 index a53a8c3..0000000 --- a/ghc/tests/ghci/prog003/D.hs +++ /dev/null @@ -1,13 +0,0 @@ -module D where - --- data types and an instance -data D a = A Int | B Float deriving Eq -newtype N a = N Double -type T a = (Int,Double) - --- a class -class C a where c :: a -> Int - --- a function -d :: Float -> Float -d x = x / 3 diff --git a/ghc/tests/ghci/prog003/D1.hs b/ghc/tests/ghci/prog003/D1.hs deleted file mode 100644 index 4414d65..0000000 --- a/ghc/tests/ghci/prog003/D1.hs +++ /dev/null @@ -1,13 +0,0 @@ -module D where - --- data types and an instance -data D a = A Int | B Float deriving Eq -newtype N a = N Double -type T a = (Int,Double) - --- a class -class C a where c :: a -> Int - --- a function -d :: Int -> Int -d x = x * 2 diff --git a/ghc/tests/ghci/prog003/D2.hs b/ghc/tests/ghci/prog003/D2.hs deleted file mode 100644 index a53a8c3..0000000 --- a/ghc/tests/ghci/prog003/D2.hs +++ /dev/null @@ -1,13 +0,0 @@ -module D where - --- data types and an instance -data D a = A Int | B Float deriving Eq -newtype N a = N Double -type T a = (Int,Double) - --- a class -class C a where c :: a -> Int - --- a function -d :: Float -> Float -d x = x / 3 diff --git a/ghc/tests/ghci/prog003/Makefile b/ghc/tests/ghci/prog003/Makefile deleted file mode 100644 index 1a5a2ef..0000000 --- a/ghc/tests/ghci/prog003/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: Makefile,v 1.1 2001/03/01 15:36:21 simonmar Exp $ - -TOP = ../.. -include $(TOP)/mk/boilerplate.mk - -include $(TOP)/mk/ghci.mk diff --git a/ghc/tests/ghci/prog003/prog003.script b/ghc/tests/ghci/prog003/prog003.script deleted file mode 100644 index 9ef5845..0000000 --- a/ghc/tests/ghci/prog003/prog003.script +++ /dev/null @@ -1,76 +0,0 @@ -:unset +s -:unset +t --- A small multi-module program, with 4 modules, Main, B, C, D. B & C --- depend on D, and A depends on B & C. --- --- This test will try various combinations of compiled and interpreted --- versions of each module, and make sure each combination behaves --- sensibly. - --- clean up -:! rm *.o *.hi -:! cp D1.hs D.hs - -:load A -:type a -a 42 - --- sigh; sleep 1, because the filesystem only stores times in seconds -:! sleep 1; cp D2.hs D.hs -:reload -:type (Main.a,B.b,C.c,D.d) -a 42 - --- compile D, check that :reload doesn't pick it up -:! $HC $HC_OPTS -c D.hs -:reload -:type (Main.a,B.b,C.c,D.d) -a 42 - --- pick up the compiled D now, with :load -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- D,C compiled -:! $HC $HC_OPTS -c C.hs -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- D,C,B compiled -:! $HC $HC_OPTS -c B.hs -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- D,C,B,A compiled -:! $HC $HC_OPTS -c A.hs -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- D,C,A compiled (better not use A.o) -:! rm B.o -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- D,A compiled (better not use A.o) -:! rm C.o -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- A compiled (better not use A.o) -:! rm D.o -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 - --- A,B,C compiled (better not use A.o, B.o, C.o) -:! $HC $HC_OPTS --make A -:! rm D.o -:load A -:type (Main.a,B.b,C.c,D.d) -a 42 diff --git a/ghc/tests/ghci/prog003/prog003.stderr b/ghc/tests/ghci/prog003/prog003.stderr deleted file mode 100644 index affe517..0000000 --- a/ghc/tests/ghci/prog003/prog003.stderr +++ /dev/null @@ -1,46 +0,0 @@ -Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Skipping D ( D.hs, D.o ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Skipping D ( D.hs, D.o ) -Skipping C ( C.hs, C.o ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Skipping D ( D.hs, D.o ) -Skipping C ( C.hs, C.o ) -Skipping B ( B.hs, B.o ) -Compiling Main ( A.hs, interpreted ) -Skipping D ( D.hs, D.o ) -Skipping C ( C.hs, C.o ) -Skipping B ( B.hs, B.o ) -Skipping Main ( A.hs, ./A.o ) -Skipping D ( D.hs, D.o ) -Skipping C ( C.hs, C.o ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Skipping D ( D.hs, D.o ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) -ghc-5.03: chasing modules from: A -Compiling D ( D.hs, D.o ) -Compiling C ( C.hs, C.o ) -Compiling B ( B.hs, B.o ) -Compiling Main ( A.hs, ./A.o ) -ghc: linking ... -Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) -Compiling B ( B.hs, interpreted ) -Compiling Main ( A.hs, interpreted ) diff --git a/ghc/tests/ghci/prog003/prog003.stdout b/ghc/tests/ghci/prog003/prog003.stdout deleted file mode 100644 index 0fe75b1..0000000 --- a/ghc/tests/ghci/prog003/prog003.stdout +++ /dev/null @@ -1,120 +0,0 @@ - ___ ___ _ - / _ \ /\ /\/ __(_) - / /_\// /_/ / / | | GHC Interactive, version 5.03, for Haskell 98. -/ /_\\/ __ / /___| | http://www.haskell.org/ghc/ -\____/\/ /_/\____/|_| Type :? for help. - -Loading package std ... linking ... done. -Prelude> :unset +s -Prelude> :unset +t -Prelude> -- A small multi-module program, with 4 modules, Main, B, C, D. B & C -Prelude> -- depend on D, and A depends on B & C. -Prelude> -- -Prelude> -- This test will try various combinations of compiled and interpreted -Prelude> -- versions of each module, and make sure each combination behaves -Prelude> -- sensibly. -Prelude> -Prelude> -- clean up -Prelude> :! rm *.o *.hi -Prelude> :! cp D1.hs D.hs -Prelude> -Prelude> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type a -Int -> Int -Main> a 42 -168 -Main> -Main> -- sigh; sleep 1, because the filesystem only stores times in seconds -Main> :! sleep 1; cp D2.hs D.hs -Main> :reload -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- compile D, check that :reload doesn't pick it up -Main> :! $HC $HC_OPTS -c D.hs -Main> :reload -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- pick up the compiled D now, with :load -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- D,C compiled -Main> :! $HC $HC_OPTS -c C.hs -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- D,C,B compiled -Main> :! $HC $HC_OPTS -c B.hs -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- D,C,B,A compiled -Main> :! $HC $HC_OPTS -c A.hs -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(PrelFloat.Float -> PrelFloat.Float, - PrelFloat.Float -> PrelFloat.Float, - PrelFloat.Float -> PrelFloat.Float, - PrelFloat.Float -> PrelFloat.Float) -Main> a 42 -28.0 -Main> -Main> -- D,C,A compiled (better not use A.o) -Main> :! rm B.o -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- D,A compiled (better not use A.o) -Main> :! rm C.o -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- A compiled (better not use A.o) -Main> :! rm D.o -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> -Main> -- A,B,C compiled (better not use A.o, B.o, C.o) -Main> :! $HC $HC_OPTS --make A -Main> :! rm D.o -Main> :load A -Ok, modules loaded: Main, B, C, D. -Main> :type (Main.a,B.b,C.c,D.d) -(Float -> Float, Float -> Float, Float -> Float, Float -> Float) -Main> a 42 -28.0 -Main> Leaving GHCi. diff --git a/ghc/tests/ghci/prog004/AA.hs b/ghc/tests/ghci/prog004/AA.hs deleted file mode 100644 index e98a145..0000000 --- a/ghc/tests/ghci/prog004/AA.hs +++ /dev/null @@ -1,2 +0,0 @@ -module AA where -aa = putStr "At her 60th birthday party, Margaret Thatcher blew on the cake to light the candles.\n" diff --git a/ghc/tests/ghci/prog004/BB.hs b/ghc/tests/ghci/prog004/BB.hs deleted file mode 100644 index f302440..0000000 --- a/ghc/tests/ghci/prog004/BB.hs +++ /dev/null @@ -1,3 +0,0 @@ -module BB where -import ZZ -bb = zz diff --git a/ghc/tests/ghci/prog004/Main.hs b/ghc/tests/ghci/prog004/Main.hs deleted file mode 100644 index c38953f..0000000 --- a/ghc/tests/ghci/prog004/Main.hs +++ /dev/null @@ -1,3 +0,0 @@ -module Main where -import YY -main = yy diff --git a/ghc/tests/ghci/prog004/Makefile b/ghc/tests/ghci/prog004/Makefile deleted file mode 100644 index e880710..0000000 --- a/ghc/tests/ghci/prog004/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: Makefile,v 1.1 2001/04/03 16:28:11 sewardj Exp $ - -TOP = ../.. -include $(TOP)/mk/boilerplate.mk - -include $(TOP)/mk/ghcmake.mk diff --git a/ghc/tests/ghci/prog004/YY.hs b/ghc/tests/ghci/prog004/YY.hs deleted file mode 100644 index ab090d9..0000000 --- a/ghc/tests/ghci/prog004/YY.hs +++ /dev/null @@ -1,3 +0,0 @@ -module YY where -import BB -yy = bb diff --git a/ghc/tests/ghci/prog004/ZZ.hs b/ghc/tests/ghci/prog004/ZZ.hs deleted file mode 100644 index 599b358..0000000 --- a/ghc/tests/ghci/prog004/ZZ.hs +++ /dev/null @@ -1,3 +0,0 @@ -module ZZ where -import AA -zz = aa diff --git a/ghc/tests/ghci/prog004/prog004.stdout b/ghc/tests/ghci/prog004/prog004.stdout deleted file mode 100644 index a7b6f8c..0000000 --- a/ghc/tests/ghci/prog004/prog004.stdout +++ /dev/null @@ -1 +0,0 @@ -At her 60th birthday party, Margaret Thatcher blew on the cake to light the candles. diff --git a/ghc/tests/mk/boilerplate.mk b/ghc/tests/mk/boilerplate.mk deleted file mode 100644 index b6ffc5b..0000000 --- a/ghc/tests/mk/boilerplate.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################# -# -# ghc/tests/mk/boilerplate.mk -# -# Boilerplate Makefile for an fptools project -# -################################################################################# - -# Begin by slurping in the boilerplate from one level up, -# with standard TOP-mangling -# Remember, TOP is the top level of the innermost level -# ( FPTOOLS_TOP, which will be set while processing -# toplevel boilerplate, is the fptools top ) - -TEST_TOP := $(TOP) -TOP := $(TOP)/.. - -include $(TOP)/mk/boilerplate.mk -TOP:=$(TEST_TOP) - -# By default, we're testing the GHC in the build tree. -HC=$(GHC_INPLACE) - -# we don't want recompilation checking in here -SRC_HC_OPTS += -no-recomp - -# ----------------------------------------------------------------- -# Everything after this point -# augments or overrides previously set variables. -# ----------------------------------------------------------------- - --include $(TOP)/mk/paths.mk --include $(TOP)/mk/opts.mk --include $(TOP)/mk/version.mk --include $(TOP)/mk/suffix.mk diff --git a/ghc/tests/mk/ghci.mk b/ghc/tests/mk/ghci.mk deleted file mode 100644 index 3160111..0000000 --- a/ghc/tests/mk/ghci.mk +++ /dev/null @@ -1,17 +0,0 @@ -#----------------------------------------------------------------------------- -# template for should_run tests. - -SCRIPTS = $(wildcard *.script) - -SRC_RUNTEST_OPTS += -x 0 \ - $(foreach i,$(wildcard $*.stdout),-o1 $(i)) \ - $(foreach i,$(wildcard $*.stderr),-o2 $(i)) - -RUNTESTS = $(filter-out $(OMITTED_RUNTESTS), $(patsubst %.script,%.run,$(SCRIPTS))) - -all :: $(RUNTESTS) - -%.run : %.script - HC=$(HC) HC_OPTS="$(HC_OPTS)" $(RUNTEST) $(HC) -i$< $(RUNTEST_OPTS) -- --interactive -ignore-dot-ghci - -include $(TOP)/mk/target.mk diff --git a/ghc/tests/mk/should_compile.mk b/ghc/tests/mk/should_compile.mk deleted file mode 100644 index 5d9b1ef..0000000 --- a/ghc/tests/mk/should_compile.mk +++ /dev/null @@ -1,27 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: should_compile.mk,v 1.5 2000/12/12 13:57:40 simonmar Exp $ -# template for should_compile tests. - -HS_SRCS = $(wildcard *.hs) - -SRC_RUNTEST_OPTS += -x 0 \ - $(foreach i,$(wildcard $*.stdout),-o1 $(i)) \ - $(foreach i,$(wildcard $*.stderr),-o2 $(i)) - -%.o : %.hs - @echo ---- Testing for successful compilation of $< - $(RUNTEST) $(HC) $(RUNTEST_OPTS) -- $(HC_OPTS) -c $< -o $@ - -%.hc : %.hs - @echo ---- Testing for successful compilation of $< - $(RUNTEST) $(HC) $(RUNTEST_OPTS) -- $(HC_OPTS) -C $< -o $@ - -ifeq "$(HCOnly)" "YES" -all :: $(HS_HCS) -else -all :: $(HS_OBJS) -endif - -# Most single-module tests are declared to be module ShouldCompile, so we -# can clean the .hi files in one go: -CLEAN_FILES += ShouldCompile.hi diff --git a/ghc/tests/mk/should_fail.mk b/ghc/tests/mk/should_fail.mk deleted file mode 100644 index ab201a9..0000000 --- a/ghc/tests/mk/should_fail.mk +++ /dev/null @@ -1,18 +0,0 @@ -#----------------------------------------------------------------------------- -# $Id: should_fail.mk,v 1.4 2000/11/03 16:23:38 simonmar Exp $ -# template for should_fail tests - -HS_SRCS = $(wildcard *.hs) - -SRC_RUNTEST_OPTS += -x 1 \ - $(foreach i,$(wildcard $*.stdout),-o1 $(i)) \ - $(foreach i,$(wildcard $*.stderr),-o2 $(i)) - -%.o : %.hs - @echo ---- Testing for failure to compile $< - @$(RUNTEST) $(HC) $(RUNTEST_OPTS) -- $(HC_OPTS) -c $< -o $@ - -all :: $(HS_OBJS) - -# occasionally a test goes wrong and compiles by mistake, so... -CLEAN_FILES += ShouldFail.hi diff --git a/ghc/tests/mk/should_run.mk b/ghc/tests/mk/should_run.mk deleted file mode 100644 index d9b5e68..0000000 --- a/ghc/tests/mk/should_run.mk +++ /dev/null @@ -1,20 +0,0 @@ -#----------------------------------------------------------------------------- -# template for should_run tests. - -HS_SRCS = $(wildcard *.hs) -BINS = $(patsubst %.o,%.bin,$(HS_OBJS)) -RUNTESTS = $(filter-out $(OMITTED_RUNTESTS), $(patsubst %.bin,%.run,$(BINS))) - -SRC_RUNTEST_OPTS += -x 0 \ - $(foreach i,$(wildcard $*.stdout),-o1 $(i)) \ - $(foreach i,$(wildcard $*.stderr),-o2 $(i)) - -all :: $(RUNTESTS) - -%.run : %.bin - $(RUNTEST) $< $(RUNTEST_OPTS) - -%.bin : %.o - $(HC) $(HC_OPTS) $($*_LD_OPTS) $< -o $@ - -CLEAN_FILES += $(BINS) Main.hi diff --git a/ghc/tests/mk/target.mk b/ghc/tests/mk/target.mk deleted file mode 100644 index 06f4a76..0000000 --- a/ghc/tests/mk/target.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################# -# -# target.mk -# -# ghc/tests standard target rules -# -################################################################################# - -include $(FPTOOLS_TOP)/mk/target.mk - -- 1.7.10.4