From 0977a6fd00f4541b8614a654c3e584e0317ee9a6 Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 21 Mar 2001 14:25:37 +0000 Subject: [PATCH] [project @ 2001-03-21 14:25:37 by simonmar] GHCi test updates --- 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/prog001/prog001.script | 1 + ghc/tests/ghci/prog001/prog001.stdout | 1 + ghc/tests/ghci/prog003/prog003.stderr | 22 +++++++++++----------- ghc/tests/ghci/prog003/prog003.stdout | 22 +++++++++++----------- 8 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 ghc/tests/ghci/ghci004.hs create mode 100644 ghc/tests/ghci/ghci004.script create mode 100644 ghc/tests/ghci/ghci004.stderr create mode 100644 ghc/tests/ghci/ghci004.stdout diff --git a/ghc/tests/ghci/ghci004.hs b/ghc/tests/ghci/ghci004.hs new file mode 100644 index 0000000..292905c --- /dev/null +++ b/ghc/tests/ghci/ghci004.hs @@ -0,0 +1,2 @@ +import List +main = print (sort [100,99..1]) diff --git a/ghc/tests/ghci/ghci004.script b/ghc/tests/ghci/ghci004.script new file mode 100644 index 0000000..4949629 --- /dev/null +++ b/ghc/tests/ghci/ghci004.script @@ -0,0 +1,4 @@ +: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 new file mode 100644 index 0000000..89f2519 --- /dev/null +++ b/ghc/tests/ghci/ghci004.stderr @@ -0,0 +1 @@ +Compiling Main ( ghci004.hs, interpreted ) diff --git a/ghc/tests/ghci/ghci004.stdout b/ghc/tests/ghci/ghci004.stdout new file mode 100644 index 0000000..9b1bae5 --- /dev/null +++ b/ghc/tests/ghci/ghci004.stdout @@ -0,0 +1,14 @@ + ___ ___ _ + / _ \ /\ /\/ __(_) + / /_\// /_/ / / | | GHC Interactive, version 4.11, 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/prog001/prog001.script b/ghc/tests/ghci/prog001/prog001.script index 2678b68..d5cfee1 100644 --- a/ghc/tests/ghci/prog001/prog001.script +++ b/ghc/tests/ghci/prog001/prog001.script @@ -13,6 +13,7 @@ main -- touch a module + recompile +:! sleep 1 :! touch C.hs :reload diff --git a/ghc/tests/ghci/prog001/prog001.stdout b/ghc/tests/ghci/prog001/prog001.stdout index 7f340a7..c697eeb 100644 --- a/ghc/tests/ghci/prog001/prog001.stdout +++ b/ghc/tests/ghci/prog001/prog001.stdout @@ -23,6 +23,7 @@ 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. diff --git a/ghc/tests/ghci/prog003/prog003.stderr b/ghc/tests/ghci/prog003/prog003.stderr index d4a49dc..7b6e5dc 100644 --- a/ghc/tests/ghci/prog003/prog003.stderr +++ b/ghc/tests/ghci/prog003/prog003.stderr @@ -1,46 +1,46 @@ Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) Compiling B ( B.hs, interpreted ) +Compiling C ( C.hs, interpreted ) Compiling Main ( A.hs, interpreted ) Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) Compiling B ( B.hs, interpreted ) +Compiling C ( C.hs, interpreted ) Compiling Main ( A.hs, interpreted ) Skipping D ( D.hs, D.o ) -Compiling C ( C.hs, interpreted ) Compiling B ( B.hs, interpreted ) +Compiling C ( C.hs, interpreted ) Compiling Main ( A.hs, interpreted ) Skipping D ( D.hs, D.o ) -Skipping C ( C.hs, C.o ) Compiling B ( B.hs, interpreted ) +Skipping C ( C.hs, C.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 C ( C.hs, C.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 C ( C.hs, C.o ) Skipping Main ( A.hs, ./A.o ) Skipping D ( D.hs, D.o ) -Skipping C ( C.hs, C.o ) Compiling B ( B.hs, interpreted ) +Skipping C ( C.hs, C.o ) Compiling Main ( A.hs, interpreted ) Skipping D ( D.hs, D.o ) -Compiling C ( C.hs, interpreted ) Compiling B ( B.hs, interpreted ) +Compiling C ( C.hs, interpreted ) Compiling Main ( A.hs, interpreted ) Compiling D ( D.hs, interpreted ) -Compiling C ( C.hs, interpreted ) Compiling B ( B.hs, interpreted ) +Compiling C ( C.hs, interpreted ) Compiling Main ( A.hs, interpreted ) ghc: chasing modules from: A Compiling D ( D.hs, D.o ) -Compiling C ( C.hs, C.o ) Compiling B ( B.hs, B.o ) +Compiling C ( C.hs, C.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 C ( C.hs, interpreted ) Compiling Main ( A.hs, interpreted ) diff --git a/ghc/tests/ghci/prog003/prog003.stdout b/ghc/tests/ghci/prog003/prog003.stdout index 96e8b34..7943ac5 100644 --- a/ghc/tests/ghci/prog003/prog003.stdout +++ b/ghc/tests/ghci/prog003/prog003.stdout @@ -19,7 +19,7 @@ Prelude> :! rm *.o *.hi Prelude> :! cp D1.hs D.hs Prelude> Prelude> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type a Int -> Int Main> a 42 @@ -28,7 +28,7 @@ Main> Main> -- sigh; sleep 1, because the comp manager only stores times in seconds Main> :! sleep 1; cp D2.hs D.hs Main> :reload -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -37,7 +37,7 @@ 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. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -45,7 +45,7 @@ Main> a 42 Main> Main> -- pick up the compiled D now, with :load Main> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -54,7 +54,7 @@ Main> Main> -- D,C compiled Main> :! $HC $HC_OPTS -c C.hs Main> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -63,7 +63,7 @@ Main> Main> -- D,C,B compiled Main> :! $HC $HC_OPTS -c B.hs Main> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -72,7 +72,7 @@ Main> Main> -- D,C,B,A compiled Main> :! $HC $HC_OPTS -c A.hs Main> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (PrelFloat.Float -> PrelFloat.Float, PrelFloat.Float -> PrelFloat.Float, @@ -84,7 +84,7 @@ 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. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -93,7 +93,7 @@ Main> Main> -- D,A compiled (better not use A.o) Main> :! rm C.o Main> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -102,7 +102,7 @@ Main> Main> -- A compiled (better not use A.o) Main> :! rm D.o Main> :load A -Ok, modules loaded: Main, B, C, D. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 @@ -112,7 +112,7 @@ 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. +Ok, modules loaded: Main, C, B, D. Main> :type (Main.a,B.b,C.c,D.d) (Float -> Float, Float -> Float, Float -> Float, Float -> Float) Main> a 42 -- 1.7.10.4