Move tests out of h98; directory now removed
authorIan Lynagh <igloo@earth.li>
Sun, 8 May 2011 20:14:31 +0000 (21:14 +0100)
committerIan Lynagh <igloo@earth.li>
Sun, 8 May 2011 20:14:31 +0000 (21:14 +0100)
67 files changed:
testsuite/tests/ghc-regress/parser/should_compile/EmptyDecls.hs [moved from testsuite/tests/h98/EmptyDecls/edecls.hs with 100% similarity]
testsuite/tests/ghc-regress/parser/should_compile/all.T
testsuite/tests/ghc-regress/parser/should_fail/all.T
testsuite/tests/ghc-regress/parser/should_fail/readFail047.hs [moved from testsuite/tests/h98/layout/bad1.hs with 67% similarity]
testsuite/tests/ghc-regress/parser/should_fail/readFail047.stderr [new file with mode: 0644]
testsuite/tests/ghc-regress/parser/should_run/all.T
testsuite/tests/ghc-regress/parser/should_run/operator.hs [new file with mode: 0644]
testsuite/tests/ghc-regress/parser/should_run/operator.stdout [new file with mode: 0644]
testsuite/tests/ghc-regress/parser/should_run/operator2.hs [moved from testsuite/tests/h98/infix/operator.hs with 100% similarity]
testsuite/tests/ghc-regress/parser/should_run/operator2.stdout [moved from testsuite/tests/h98/infix/operator.expect.stdout with 100% similarity]
testsuite/tests/ghc-regress/programs/Queens/Makefile [new file with mode: 0644]
testsuite/tests/ghc-regress/programs/Queens/queens.hs [moved from testsuite/tests/h98/Queens/queens.hs with 100% similarity]
testsuite/tests/ghc-regress/programs/Queens/queens.stdout [moved from testsuite/tests/h98/Queens/queens.expect.stdout with 100% similarity]
testsuite/tests/ghc-regress/programs/Queens/test.T [new file with mode: 0644]
testsuite/tests/ghc-regress/typecheck/should_compile/all.T
testsuite/tests/ghc-regress/typecheck/should_compile/tc249.hs [moved from testsuite/tests/h98/ctxsimpl/ok1.hs with 100% similarity]
testsuite/tests/ghc-regress/typecheck/should_fail/all.T
testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.hs [moved from testsuite/tests/h98/ctxsimpl/bad1.hs with 100% similarity]
testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.stderr [new file with mode: 0644]
testsuite/tests/h98/Array/largeArray.T [deleted file]
testsuite/tests/h98/Array/largeArray.expect.stdout [deleted file]
testsuite/tests/h98/Array/largeArray.hs [deleted file]
testsuite/tests/h98/Directory/getDCs.T [deleted file]
testsuite/tests/h98/Directory/getDCs.hs [deleted file]
testsuite/tests/h98/EmptyDecls/edecls.T [deleted file]
testsuite/tests/h98/EmptyDecls/edecls.expect.stdout [deleted file]
testsuite/tests/h98/Enum/all.T [deleted file]
testsuite/tests/h98/Enum/list.expected.stdout [deleted file]
testsuite/tests/h98/Enum/list.hs [deleted file]
testsuite/tests/h98/Enum/succ.expect.stdout [deleted file]
testsuite/tests/h98/Enum/succ.hs [deleted file]
testsuite/tests/h98/N+K/nplusk.T [deleted file]
testsuite/tests/h98/N+K/nplusk.expect.stdout [deleted file]
testsuite/tests/h98/N+K/nplusk.hs [deleted file]
testsuite/tests/h98/Queens/queens.T [deleted file]
testsuite/tests/h98/chr/chr1.T [deleted file]
testsuite/tests/h98/chr/chr1.expected.stdout [deleted file]
testsuite/tests/h98/chr/chr1.hs [deleted file]
testsuite/tests/h98/chr/testconfig.T [deleted file]
testsuite/tests/h98/ctxsimpl/all.T [deleted file]
testsuite/tests/h98/ctxsimpl/bad/testconfig.T [deleted file]
testsuite/tests/h98/fields/all.T [deleted file]
testsuite/tests/h98/fields/empty.hs [deleted file]
testsuite/tests/h98/fields/operator.expected.stdout [deleted file]
testsuite/tests/h98/fields/operator.hs [deleted file]
testsuite/tests/h98/fields/puns.hs [deleted file]
testsuite/tests/h98/fields/puns/testconfig.T [deleted file]
testsuite/tests/h98/fields/showread.expect.stdout [deleted file]
testsuite/tests/h98/fields/showread.hs [deleted file]
testsuite/tests/h98/fields/type.expect.stdout [deleted file]
testsuite/tests/h98/fields/type.hs [deleted file]
testsuite/tests/h98/float/show.T [deleted file]
testsuite/tests/h98/float/show.hs [deleted file]
testsuite/tests/h98/identifiers/all.T [deleted file]
testsuite/tests/h98/identifiers/qual.hs [deleted file]
testsuite/tests/h98/identifiers/twiddle.hs [deleted file]
testsuite/tests/h98/infix/all.T [deleted file]
testsuite/tests/h98/infix/fndecl.hs [deleted file]
testsuite/tests/h98/infix/infix.expect.stdout [deleted file]
testsuite/tests/h98/infix/infix.hs [deleted file]
testsuite/tests/h98/infix/local.expect.stdout [deleted file]
testsuite/tests/h98/infix/local.hs [deleted file]
testsuite/tests/h98/infix/minus.expect.stdout [deleted file]
testsuite/tests/h98/infix/minus.hs [deleted file]
testsuite/tests/h98/layout/bad/testconfig.T [deleted file]
testsuite/tests/h98/layout/bad1.T [deleted file]
testsuite/tests/h98/run [deleted file]

index 2ba52c2..da5ec15 100644 (file)
@@ -88,3 +88,4 @@ test('DoAndIfThenElse', normal, compile, [''])
 test('NondecreasingIndentation', normal, compile, [''])
 test('mc15', normal, compile, [''])
 test('mc16', expect_broken_for(4370, ['ghci','hpc']), compile, [''])
+test('EmptyDecls', normal, compile, [''])
index 9bea763..31ec0d9 100644 (file)
@@ -49,6 +49,7 @@ test('readFail042', normal, compile_fail, [''])
 test('readFail043', normal, compile_fail, [''])
 test('readFail044', normal, compile_fail, [''])
 test('readFail046', normal, compile_fail, [''])
+test('readFail047', normal, compile_fail, [''])
 test('T3095', normal, compile_fail, [''])
 test('T3153', normal, compile_fail, [''])
 test('T3751', normal, compile_fail, [''])
@@ -1,8 +1,9 @@
 
+module ShouldFail where
+
 foo = let
     x = (1, 2
     y = 3
   in
   fst x + y
 
-main = print foo
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail047.stderr b/testsuite/tests/ghc-regress/parser/should_fail/readFail047.stderr
new file mode 100644 (file)
index 0000000..53af11c
--- /dev/null
@@ -0,0 +1,2 @@
+
+readFail047.hs:6:5: parse error (possibly incorrect indentation)
index f1625d3..17d6bc0 100644 (file)
@@ -3,3 +3,5 @@ test('readRun002', normal, compile_and_run, [''])
 test('readRun003', normal, compile_and_run, [''])
 test('readRun004', expect_broken_for(1257, ['ghci']), compile_and_run, [''])
 test('T1344', normal, compile_and_run, [''])
+test('operator', normal, compile_and_run, [''])
+test('operator2', normal, compile_and_run, [''])
diff --git a/testsuite/tests/ghc-regress/parser/should_run/operator.hs b/testsuite/tests/ghc-regress/parser/should_run/operator.hs
new file mode 100644 (file)
index 0000000..5a7bcf9
--- /dev/null
@@ -0,0 +1,23 @@
+module Main where
+
+data Hash = Hash { (#) :: Int }
+  deriving (Show,Read)
+
+main = do
+  let h = Hash 3
+      s = show h
+      x = read s :: Hash
+      y = show x
+  print h
+  putStrLn s
+  print x
+  putStrLn y
+  let h' = Hash { (#) = 3 }
+      s' = show h'
+      x' = read s' :: Hash
+      y' = show x'
+  print h'
+  putStrLn s'
+  print x'
+  putStrLn y'
+
diff --git a/testsuite/tests/ghc-regress/parser/should_run/operator.stdout b/testsuite/tests/ghc-regress/parser/should_run/operator.stdout
new file mode 100644 (file)
index 0000000..b56f190
--- /dev/null
@@ -0,0 +1,8 @@
+Hash {(#) = 3}
+Hash {(#) = 3}
+Hash {(#) = 3}
+Hash {(#) = 3}
+Hash {(#) = 3}
+Hash {(#) = 3}
+Hash {(#) = 3}
+Hash {(#) = 3}
diff --git a/testsuite/tests/ghc-regress/programs/Queens/Makefile b/testsuite/tests/ghc-regress/programs/Queens/Makefile
new file mode 100644 (file)
index 0000000..1c39d1c
--- /dev/null
@@ -0,0 +1,3 @@
+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/Queens/test.T b/testsuite/tests/ghc-regress/programs/Queens/test.T
new file mode 100644 (file)
index 0000000..044ebf6
--- /dev/null
@@ -0,0 +1,6 @@
+
+test('queens',
+     [skip_if_fast,
+      extra_clean(['Main.hi', 'Main.o'])],
+     compile_and_run,
+     [''])
index 46723b6..83be8a5 100644 (file)
@@ -345,3 +345,4 @@ test('T4969', normal, compile, [''])
 
 test('T5120', normal, compile, [''])
 test('mc18', expect_broken_for(4370, ['hpc']), compile, [''])
+test('tc249', normal, compile, [''])
index a5ac947..e9a2d49 100644 (file)
@@ -236,4 +236,5 @@ test('mc24', normal, compile_fail, [''])
 test('mc25', normal, compile_fail, [''])
 test('tcfail207', normal, compile_fail, [''])
 test('T5084', normal, compile_fail, [''])
+test('tcfail208', normal, compile_fail, [''])
 
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.stderr
new file mode 100644 (file)
index 0000000..64200a6
--- /dev/null
@@ -0,0 +1,13 @@
+
+tcfail208.hs:4:19:
+    Could not deduce (Eq (m a)) arising from a use of `=='
+    from the context (Monad m, Eq a)
+      bound by the type signature for
+                 f :: (Monad m, Eq a) => a -> m a -> Bool
+      at tcfail208.hs:4:1-23
+    Possible fix:
+      add (Eq (m a)) to the context of
+        the type signature for f :: (Monad m, Eq a) => a -> m a -> Bool
+      or add an instance declaration for (Eq (m a))
+    In the expression: (return x == y)
+    In an equation for `f': f x y = (return x == y)
diff --git a/testsuite/tests/h98/Array/largeArray.T b/testsuite/tests/h98/Array/largeArray.T
deleted file mode 100644 (file)
index 687a9a1..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "largeArray" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout"))
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/Array/largeArray.expect.stdout b/testsuite/tests/h98/Array/largeArray.expect.stdout
deleted file mode 100644 (file)
index b4de394..0000000
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/testsuite/tests/h98/Array/largeArray.hs b/testsuite/tests/h98/Array/largeArray.hs
deleted file mode 100644 (file)
index 8f40160..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-import Array
-
-main = print (((!1).inc.inc.inc.inc.inc.inc.inc.inc.inc.inc) a)
-
-size = 60
-
-a :: Array Int Integer
-a = listArray (1,size) [1..]
-
-inc a = accum (+) a [(i,1) | i <- [1..size]]
diff --git a/testsuite/tests/h98/Directory/getDCs.T b/testsuite/tests/h98/Directory/getDCs.T
deleted file mode 100644 (file)
index 7c7a4bf..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "getDCs" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   -- sigh
-   $stuff = contents(qualify("run.stdout"))
-   pass when 
-      $stuff contains "bin" &&
-      $stuff contains "lib" &&
-      $stuff contains "include"
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/Directory/getDCs.hs b/testsuite/tests/h98/Directory/getDCs.hs
deleted file mode 100644 (file)
index fe76779..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-import Directory
-
-main = do
-  -- We can no longer first ask what the current dir is and
-  -- then read its contents, because the results thereof depend
-  -- on the current directory at the time the test run was 
-  -- started, and that can't be assumed to be any particular value.
-  fs <- getDirectoryContents "/usr"
-  mapM_ (\f-> putStrLn ("    "++f)) fs
diff --git a/testsuite/tests/h98/EmptyDecls/edecls.T b/testsuite/tests/h98/EmptyDecls/edecls.T
deleted file mode 100644 (file)
index 55f56fb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "edecls" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
\ No newline at end of file
diff --git a/testsuite/tests/h98/EmptyDecls/edecls.expect.stdout b/testsuite/tests/h98/EmptyDecls/edecls.expect.stdout
deleted file mode 100644 (file)
index 0ca9514..0000000
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/testsuite/tests/h98/Enum/all.T b/testsuite/tests/h98/Enum/all.T
deleted file mode 100644 (file)
index 619f33c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "list" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expected.stdout"))
-   fail when otherwise
-}
-
-test "succ" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/Enum/list.expected.stdout b/testsuite/tests/h98/Enum/list.expected.stdout
deleted file mode 100644 (file)
index 0d5cbaf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[1 % 1]
diff --git a/testsuite/tests/h98/Enum/list.hs b/testsuite/tests/h98/Enum/list.hs
deleted file mode 100644 (file)
index 406865a..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-import Ratio
-main = print [ 1, 4%(3::Int) .. 1 ]
diff --git a/testsuite/tests/h98/Enum/succ.expect.stdout b/testsuite/tests/h98/Enum/succ.expect.stdout
deleted file mode 100644 (file)
index a5093aa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-1.0e20
diff --git a/testsuite/tests/h98/Enum/succ.hs b/testsuite/tests/h98/Enum/succ.hs
deleted file mode 100644 (file)
index c29c0e7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-main = print (succ (1.0e20))
diff --git a/testsuite/tests/h98/N+K/nplusk.T b/testsuite/tests/h98/N+K/nplusk.T
deleted file mode 100644 (file)
index 5822198..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "nplusk" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout"))
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/N+K/nplusk.expect.stdout b/testsuite/tests/h98/N+K/nplusk.expect.stdout
deleted file mode 100644 (file)
index 82d0980..0000000
+++ /dev/null
@@ -1 +0,0 @@
-fib 10 = 89
diff --git a/testsuite/tests/h98/N+K/nplusk.hs b/testsuite/tests/h98/N+K/nplusk.hs
deleted file mode 100644 (file)
index 5ffc865..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-import System
-
-fib :: Integer -> Integer
-
-fib 0 = 1
-fib 1 = 1
-fib (n+2) = fib (n+1) + fib n
---fib n = fib (n-1) + fib (n-2)
-
-main = do args <- getArgs
-          if null args then
-            putStrLn ("fib 10 = " ++ show (fib 10))
-           else
-            mapM_ (\arg-> putStrLn ("fib "++arg++" = " ++ show (fib (read arg))))
-                  args
diff --git a/testsuite/tests/h98/Queens/queens.T b/testsuite/tests/h98/Queens/queens.T
deleted file mode 100644 (file)
index 26ca80f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "queens" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/chr/chr1.T b/testsuite/tests/h98/chr/chr1.T
deleted file mode 100644 (file)
index 9cdf791..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "chr1" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expected.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/chr/chr1.expected.stdout b/testsuite/tests/h98/chr/chr1.expected.stdout
deleted file mode 100644 (file)
index 0ca9514..0000000
+++ /dev/null
@@ -1 +0,0 @@
-True
diff --git a/testsuite/tests/h98/chr/chr1.hs b/testsuite/tests/h98/chr/chr1.hs
deleted file mode 100644 (file)
index 9e5db5e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-module Main where
-main = let zzz = (toEnum (qqq 256)) :: Char
-       in  putStrLn (show (zzz == zzz))
-
--- Only here to defeat potential compile-time evaluation of
--- toEnum applied to literal arg, in excessively clever compilers
-qqq :: Int -> Int
-qqq 0 = 0
-qqq n = 1 + qqq (n-1)
-
diff --git a/testsuite/tests/h98/chr/testconfig.T b/testsuite/tests/h98/chr/testconfig.T
deleted file mode 100644 (file)
index 33ea12b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-include ($confdir ++ "/../std-macros.T")
-expect pass
-
-pretest_cleanup()
-
-simple_build_Main()
-$res = simple_run_main_no_stdin()
-
-pass when 
-   contents("run.stdout") contains "True"
-
-fail when otherwise
diff --git a/testsuite/tests/h98/ctxsimpl/all.T b/testsuite/tests/h98/ctxsimpl/all.T
deleted file mode 100644 (file)
index 1a9ca81..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "ok1" {
-   expect pass
-   pretest_cleanup()
-   $res = simple_compile_Main()
-   pass when contents(qualify("comp.stdout")) == ""
-   fail when otherwise
-}
-
-
-test "bad1" {
-   expect pass
-   pretest_cleanup()
-   $res = simple_compile_Main()
-   pass when 
-      $tool contains "ghc"
-      && contents(qualify("comp.stdout")) contains "Could not deduce"
-   pass when 
-      $tool contains "nhc"
-      && contents(qualify("comp.stdout")) contains "Couldn't simplify the context"
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/ctxsimpl/bad/testconfig.T b/testsuite/tests/h98/ctxsimpl/bad/testconfig.T
deleted file mode 100644 (file)
index 2e8d2aa..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-include ($confdir ++ "/../std-macros.T")
-expect pass
-
-pretest_cleanup()
-$res = simple_compile_Main()
-
-pass when 
-   $tool contains "ghc"
-   && contents("comp.stdout") contains "Could not deduce"
-
-pass when 
-   $tool contains "nhc"
-   && contents("comp.stdout") contains "Couldn't simplify the context"
-
-fail when otherwise
diff --git a/testsuite/tests/h98/fields/all.T b/testsuite/tests/h98/fields/all.T
deleted file mode 100644 (file)
index f9cdfca..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "empty" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) == "True\n"
-   fail when otherwise
-}
-
-test "operator" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout"))
-             == contents(qualify("expected.stdout"))
-   fail when otherwise
-}
-
-test "puns" {
-   expect pass
-   pretest_cleanup()
-   $res = simple_compile_Main()
-   pass when 
-      $tool contains "ghc"
-      && contents(qualify("comp.stdout")) contains "parse error on input"
-   pass when 
-      $tool contains "nhc"
-      && contents(qualify("comp.stdout")) contains "Named field puns"
-   fail when otherwise
-}
-
-test "showread" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
-
-test "type" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/fields/empty.hs b/testsuite/tests/h98/fields/empty.hs
deleted file mode 100644 (file)
index d7a10df..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-module Main where
-
-data T = T1 Int Int Int
-       | T2 Float Float Float
-
-f (T1 {}) = True
-f (T2 {}) = False
-
-main = print (f (T1 1 2 3))
diff --git a/testsuite/tests/h98/fields/operator.expected.stdout b/testsuite/tests/h98/fields/operator.expected.stdout
deleted file mode 100644 (file)
index 81de56f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Hash{(#)=3}
-Hash{(#)=3}
diff --git a/testsuite/tests/h98/fields/operator.hs b/testsuite/tests/h98/fields/operator.hs
deleted file mode 100644 (file)
index 1457ac4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-module Main where
-
-data Hash = Hash { (#) :: Int }
-  deriving (Show,Read)
-
-main = do
-  putStrLn s
-  print (read s :: Hash)
- where
-  s = show (Hash 3)
-
diff --git a/testsuite/tests/h98/fields/puns.hs b/testsuite/tests/h98/fields/puns.hs
deleted file mode 100644 (file)
index 541d3b9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-data Point = Point { x,y :: Int } deriving Show
-
-f (Point {x,y}) = Point {x, y=y+1}
-
-main = print (f (Point {x=0,y=0}))
diff --git a/testsuite/tests/h98/fields/puns/testconfig.T b/testsuite/tests/h98/fields/puns/testconfig.T
deleted file mode 100644 (file)
index 273cc59..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-include ($confdir ++ "/../std-macros.T")
-expect pass
-
-pretest_cleanup()
-$res = simple_compile_Main()
-
-pass when 
-   $tool contains "ghc"
-   && contents("comp.stdout") contains "parse error on input"
-
-pass when 
-   $tool contains "nhc"
-   && contents("comp.stdout") contains "Named field puns"
-
-fail when otherwise
diff --git a/testsuite/tests/h98/fields/showread.expect.stdout b/testsuite/tests/h98/fields/showread.expect.stdout
deleted file mode 100644 (file)
index 9eda653..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-(Foo{foo=1,bar=99},Foo{foo=(),bar=99},Foo{foo=True,bar=99})
-(Foo{foo=1,bar=99},Foo{foo=(),bar=99},Foo{foo=True,bar=99})
diff --git a/testsuite/tests/h98/fields/showread.hs b/testsuite/tests/h98/fields/showread.hs
deleted file mode 100644 (file)
index 60478e9..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-
-data Foo a = Foo { foo :: a
-                 , bar :: Int
-                 } deriving (Show,Read)
-
-up s t = s { foo = t }
-
-obj = Foo { foo = 1 :: Int
-          , bar = 99
-          }
-
-main = let expr = ( obj
-                  , up obj ()
-                  , obj {foo=True}
-                  )
-       in do
-       print expr
-       print (((read.show) expr) `asTypeOf` expr)
diff --git a/testsuite/tests/h98/fields/type.expect.stdout b/testsuite/tests/h98/fields/type.expect.stdout
deleted file mode 100644 (file)
index dcfcbf8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-(Foo{foo=1,bar=99},Foo{foo=(),bar=99},Foo{foo=True,bar=99})
diff --git a/testsuite/tests/h98/fields/type.hs b/testsuite/tests/h98/fields/type.hs
deleted file mode 100644 (file)
index cd875bd..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-data Foo a = Foo { foo :: a
-                 , bar :: Int
-                 } deriving Show
-
-up s t = s { foo = t }
-
-obj = Foo { foo = 1 :: Int
-          , bar = 99
-          }
-
-main = print ( obj
-             , up obj ()
-             , obj {foo=True}
-             )
diff --git a/testsuite/tests/h98/float/show.T b/testsuite/tests/h98/float/show.T
deleted file mode 100644 (file)
index 2e46c0a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "show" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stderr")) 
-             contains "Prelude.read: no parse"
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/float/show.hs b/testsuite/tests/h98/float/show.hs
deleted file mode 100644 (file)
index 914464b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-import Numeric
-
-main = do
-  s <- return ""
-  putStrLn (showFloat ((read s)::Float) "")
diff --git a/testsuite/tests/h98/identifiers/all.T b/testsuite/tests/h98/identifiers/all.T
deleted file mode 100644 (file)
index 81c46fe..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "qual" {
-   expect pass
-   pretest_cleanup()
-   $res = simple_compile_Main()
-   pass when contents(qualify("comp.stdout")) == ""
-   fail when otherwise
-}
-
-test "twiddle" {
-   expect pass
-   pretest_cleanup()
-   $res = simple_compile_Main()
-   pass when contents(qualify("comp.stdout")) == ""
-   fail when otherwise
-}
\ No newline at end of file
diff --git a/testsuite/tests/h98/identifiers/qual.hs b/testsuite/tests/h98/identifiers/qual.hs
deleted file mode 100644 (file)
index a31b482..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-module Test where
-f = Just.let x = id in x
diff --git a/testsuite/tests/h98/identifiers/twiddle.hs b/testsuite/tests/h98/identifiers/twiddle.hs
deleted file mode 100644 (file)
index 43bd9b9..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-module Twiddle where
-
-main = let foo@(~(x,y)) = (1,2)
-       in print foo
diff --git a/testsuite/tests/h98/infix/all.T b/testsuite/tests/h98/infix/all.T
deleted file mode 100644 (file)
index 5e123fd..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "fndecl" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main()
-   pass when contents(qualify("run.stdout"))
-             == contents(qualify("expected.stdout"))
-   fail when otherwise
-}
-
-test "infix" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-        == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
-
-test "local" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout"))
-         == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
-
-test "minus" {
-   expect unknown      -- should this compile or not?
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-             == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
-
-test "operator" {
-   expect pass
-   pretest_cleanup()
-   simple_build_Main()
-   $res = simple_run_main_no_stdin()
-   pass when contents(qualify("run.stdout")) 
-        == contents(qualify("expect.stdout"))
-   fail when otherwise
-}
diff --git a/testsuite/tests/h98/infix/fndecl.hs b/testsuite/tests/h98/infix/fndecl.hs
deleted file mode 100644 (file)
index 86373d3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-module Main where
-
-
-infixr 5 <>
-(<>) :: (a -> Maybe b) -> (b -> Maybe c) -> (a -> Maybe c)
-(m1 <> m2) a1 = case m1 a1 of
-                  Nothing -> Nothing
-                  Just a2 -> m2 a2
-
-main = print ((Just <> Just) 1)
diff --git a/testsuite/tests/h98/infix/infix.expect.stdout b/testsuite/tests/h98/infix/infix.expect.stdout
deleted file mode 100644 (file)
index b8626c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/testsuite/tests/h98/infix/infix.hs b/testsuite/tests/h98/infix/infix.hs
deleted file mode 100644 (file)
index 373ea6a..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-module Main where
-
-def1 :: Int
-def1 = 3
-
-infixl 9 -->
-(-->) :: Int -> Int -> Int
-x --> y = x * y + y
-
-interior z =
-    let infixr 7 -->
-        (-->) :: Float -> Float -> Float
-        x --> y = y * x + x
-    in 
-    z --> 3.0
-
-main = print (def1 --> 1)
diff --git a/testsuite/tests/h98/infix/local.expect.stdout b/testsuite/tests/h98/infix/local.expect.stdout
deleted file mode 100644 (file)
index b4de394..0000000
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/testsuite/tests/h98/infix/local.hs b/testsuite/tests/h98/infix/local.hs
deleted file mode 100644 (file)
index 79759dc..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-main = print val
-val = 3 +! 4 *! 2
-  where (+!) = (+)
-        (*!) = (*)
-        infixl 6 +!
-        infixl 7 *!
diff --git a/testsuite/tests/h98/infix/minus.expect.stdout b/testsuite/tests/h98/infix/minus.expect.stdout
deleted file mode 100644 (file)
index 53c2ee5..0000000
+++ /dev/null
@@ -1 +0,0 @@
--12
diff --git a/testsuite/tests/h98/infix/minus.hs b/testsuite/tests/h98/infix/minus.hs
deleted file mode 100644 (file)
index fb70112..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-f :: Integer
-f = 3 * -4
-
-main = print f
diff --git a/testsuite/tests/h98/layout/bad/testconfig.T b/testsuite/tests/h98/layout/bad/testconfig.T
deleted file mode 100644 (file)
index a9a3b90..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-include ($confdir ++ "/../std-macros.T")
-expect pass
-
-pretest_cleanup()
-$res = simple_compile_Main()
-
-pass when 
-   $tool contains "ghc"
-   && contents("comp.stdout") contains "parse error"
-
-pass when 
-   $tool contains "nhc"
-   && contents("comp.stdout") contains "Found {-end-of-definition-} but"
-
-fail when otherwise
diff --git a/testsuite/tests/h98/layout/bad1.T b/testsuite/tests/h98/layout/bad1.T
deleted file mode 100644 (file)
index d4b5531..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-include ($confdir ++ "/../singlefile-macros.T")
-
-test "bad1" {
-   expect pass
-   pretest_cleanup()
-   $res = simple_compile_Main()
-   pass when 
-      $tool contains "ghc"
-      && contents(qualify("comp.stdout")) contains "parse error"
-      && contents(qualify("comp.stdout")) contains "possibly incorrect indentation"
-   pass when 
-      $tool contains "nhc"
-      && contents(qualify("comp.stdout")) contains "Found {-end-of-definition-} but"
-   fail when otherwise
-}
\ No newline at end of file
diff --git a/testsuite/tests/h98/run b/testsuite/tests/h98/run
deleted file mode 100644 (file)
index 869e718..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Run the tests in this directory in an easy way
-# The next line is the only one you need to modify
-#   should this directory change location relative to
-#   the top of the testsuite dir
-TESTSUITE_ROOT=../..
-
-# We assume that $TESTSUITE_ROOT/config/default/default.T is a symlink
-# to the real config file you wish to use.
-
-exec $TESTSUITE_ROOT/driver/runtests \
-   --tool=$TESTSUITE_ROOT/../ghc/compiler/ghc-inplace \
-   --config=$TESTSUITE_ROOT/config/default/default.T \
-   --rootdir=. \
-   $*