[project @ 2001-08-21 16:18:35 by simonmar]

Update output.

All these tests now work with the current sources, after exposing
several bugs.  Tests are great.

diff --git a/ghc/tests/ghci/prog001/prog001.script b/ghc/tests/ghci/prog001/prog001.script
index d5cfee1..2479e42 100644 (file)
--- a/ghc/tests/ghci/prog001/prog001.script
+++ b/ghc/tests/ghci/prog001/prog001.script
@@ -25,7 +25,7 @@ main
 :reload
 main
 
--- change A, recompile & reload
+-- change D, recompile & reload
 :! cp D2.hs D.hs
 :! $HC $HC_OPTS -no-recomp -c D.hs
 :reload

diff --git a/ghc/tests/ghci/prog001/prog001.stdout b/ghc/tests/ghci/prog001/prog001.stdout
index a333f37..6b26c99 100644 (file)
--- a/ghc/tests/ghci/prog001/prog001.stdout
+++ b/ghc/tests/ghci/prog001/prog001.stdout
@@ -39,7 +39,7 @@ Ok, modules loaded: Main, B, C, D.
 Main> main
 "hello world84"
 Main> 
-Main> -- change A, recompile & reload
+Main> -- change D, recompile & reload
 Main> :! cp D2.hs D.hs
 Main> :! $HC $HC_OPTS -no-recomp -c D.hs
 Main> :reload

diff --git a/ghc/tests/ghci/prog003/prog003.script b/ghc/tests/ghci/prog003/prog003.script
index 594c688..9ef5845 100644 (file)
--- a/ghc/tests/ghci/prog003/prog003.script
+++ b/ghc/tests/ghci/prog003/prog003.script
@@ -15,7 +15,7 @@
 :type a
 a 42
 
--- sigh; sleep 1, because the comp manager only stores times in seconds
+-- 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)

diff --git a/ghc/tests/ghci/prog003/prog003.stderr b/ghc/tests/ghci/prog003/prog003.stderr
index 7b6e5dc..001dc82 100644 (file)
--- a/ghc/tests/ghci/prog003/prog003.stderr
+++ b/ghc/tests/ghci/prog003/prog003.stderr
@@ -1,46 +1,46 @@
 Compiling D                ( D.hs, interpreted )
-Compiling B                ( B.hs, interpreted )
 Compiling C                ( C.hs, interpreted )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
 Compiling D                ( D.hs, interpreted )
-Compiling B                ( B.hs, interpreted )
 Compiling C                ( C.hs, interpreted )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
 Skipping  D                ( D.hs, D.o )
-Compiling B                ( B.hs, interpreted )
 Compiling C                ( C.hs, interpreted )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
 Skipping  D                ( D.hs, D.o )
-Compiling B                ( B.hs, interpreted )
 Skipping  C                ( C.hs, C.o )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
 Skipping  D                ( D.hs, D.o )
-Skipping  B                ( B.hs, B.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  B                ( B.hs, B.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 )
-Compiling B                ( B.hs, interpreted )
 Skipping  C                ( C.hs, C.o )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
 Skipping  D                ( D.hs, D.o )
-Compiling B                ( B.hs, interpreted )
 Compiling C                ( C.hs, interpreted )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
 Compiling D                ( D.hs, interpreted )
-Compiling B                ( B.hs, interpreted )
 Compiling C                ( C.hs, interpreted )
+Compiling B                ( B.hs, interpreted )
 Compiling Main             ( A.hs, interpreted )
-ghc: chasing modules from: A
+ghc-5.01: chasing modules from: A
 Compiling D                ( D.hs, D.o )
-Compiling B                ( B.hs, B.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 B                ( B.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
index 7943ac5..b79b3b1 100644 (file)
--- a/ghc/tests/ghci/prog003/prog003.stdout
+++ b/ghc/tests/ghci/prog003/prog003.stdout
@@ -1,6 +1,6 @@
    ___         ___ _
   / _ \ /\  /\/ __(_)
- / /_\// /_/ / /  | |      GHC Interactive, version 4.11, For Haskell 98.
+ / /_\// /_/ / /  | |      GHC Interactive, version 5.01, for Haskell 98.
 / /_\\/ __  / /___| |      http://www.haskell.org/ghc/
 \____/\/ /_/\____/|_|      Type :? for help.
 
@@ -19,16 +19,16 @@ Prelude> :! rm *.o *.hi
 Prelude> :! cp D1.hs D.hs
 Prelude> 
 Prelude> :load A
-Ok, modules loaded: Main, C, B, D.
+Ok, modules loaded: Main, B, C, D.
 Main> :type a
 Int -> Int
 Main> a 42
 168
 Main> 
-Main> -- sigh; sleep 1, because the comp manager only stores times in seconds
+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, C, B, D.
+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
@@ -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, C, B, D.
+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
@@ -45,7 +45,7 @@ Main> a 42
 Main> 
 Main> -- pick up the compiled D now, with :load
 Main> :load A
-Ok, modules loaded: Main, C, B, D.
+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
@@ -54,7 +54,7 @@ Main>
 Main> -- D,C compiled
 Main> :! $HC $HC_OPTS -c C.hs
 Main> :load A
-Ok, modules loaded: Main, C, B, D.
+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
@@ -63,7 +63,7 @@ Main>
 Main> -- D,C,B compiled
 Main> :! $HC $HC_OPTS -c B.hs
 Main> :load A
-Ok, modules loaded: Main, C, B, D.
+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
@@ -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, C, B, D.
+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,
@@ -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, C, B, D.
+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
@@ -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, C, B, D.
+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
@@ -102,7 +102,7 @@ Main>
 Main> -- A compiled  (better not use A.o)
 Main> :! rm D.o
 Main> :load A
-Ok, modules loaded: Main, C, B, D.
+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
@@ -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, C, B, D.
+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