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

Knock this into slightly better shape and bring over some more tests
from the old test suite.

testsuite/tests/ghc-regress/array/should_run/run

-#!/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=. \
-   $*

testsuite/tests/ghc-regress/ccall/should_compile/all.T

@@ -9,13 +9,15 @@ def myvtc($extra_comp_args)
    vtc(" -fglasgow-exts -package lang " ++ $extra_comp_args)
 }
 
+$compile_to_hc = "True"
+
 test "cc001" { myvtc("") }
 test "cc002" { myvtc("") }
 test "cc003" { myvtc("") }
-test "cc004" { myvtc("-fvia-C") }
-test "cc005" { myvtc("-fvia-C") }
-test "cc006" { myvtc("-fvia-C -fno-prune-tydecls") }
+test "cc004" { myvtc("") }
+test "cc005" { myvtc("") }
+test "cc006" { myvtc("-fno-prune-tydecls") }
 test "cc007" { myvtc("") }
 test "cc008" { myvtc("") }
 test "cc009" { myvtc("") }
-test "cc010" { myvtc("-fvia-C") }
+test "cc010" { myvtc("") }

testsuite/tests/ghc-regress/ccall/should_fail/all.T

@@ -5,7 +5,7 @@ include ($confdir ++ "/../vanilla-test.T")
 
 def myvtcf ( $args )
 {
-   vtcf ( " -package lang " ++ $args)
+   vtcf ( " -fglasgow-exts -package lang " ++ $args)
 }
 
 test "cc001" { myvtcf("") }

testsuite/tests/ghc-regress/ccall/should_fail/cc001.stderr

 
-cc001.hs:5:
+./cc001.hs:5:
     Ambiguous type variable(s) `t'
 	in the constraint `PrelGHC.CCallable t'
-    arising from an argument in the _ccall_ to `foo', namely `(undefined ())' at cc001.hs:5
-    in the definition of function `f': _ccall_ foo (undefined ())
+    arising from an argument in the _ccall_ to `foo', namely `(undefined ())' at ./cc001.hs:5
+    In the definition of `f': _ccall_ foo (undefined ())

testsuite/tests/ghc-regress/ccall/should_fail/cc002.stderr

 
-cc002.hs:10:
+./cc002.hs:10:
     No instance for `PrelGHC.CReturnable ForeignObj'
-    arising from the result of the _ccall_ to `a' at cc002.hs:10
-    in the definition of function `a': _ccall_ a
+    arising from the result of the _ccall_ to `a' at ./cc002.hs:10
+    In the definition of `a': _ccall_ a

testsuite/tests/ghc-regress/ccall/should_fail/cc004.stderr

 
-Cannot generalise these overloadings (in a _ccall_):
-    PrelGHC.CReturnable a arising from the result of the _ccall_ to `f' at cc004.hs:8
-
-Cannot generalise these overloadings (in a _ccall_):
-    PrelGHC.CReturnable a arising from the result of the _ccall_ to `f' at cc004.hs:15
-
-cc004.hs:8:
+./cc004.hs:8:
     Ambiguous type variable(s) `a'
 	in the constraint `PrelGHC.CReturnable a'
-    arising from the result of the _ccall_ to `f' at cc004.hs:8
+    arising from the result of the _ccall_ to `f' at ./cc004.hs:8
     In the first argument of `thenADR', namely `_ccall_ f'
-    in the definition of function `foo':
+    In the definition of `foo':
 	(_ccall_ f) `thenADR` (\ a -> return (a + 1))
 
-cc004.hs:8:
+./cc004.hs:8:
     Ambiguous type variable(s) `a' in the constraint `Num a'
-    arising from the literal `1' at cc004.hs:8
+    arising from the literal `1' at ./cc004.hs:8
     In the second argument of `(+)', namely `1'
     In the first argument of `return', namely `(a + 1)'
 
-cc004.hs:15:
+./cc004.hs:15:
     Ambiguous type variable(s) `a'
 	in the constraint `PrelGHC.CReturnable a'
-    arising from the result of the _ccall_ to `f' at cc004.hs:15
+    arising from the result of the _ccall_ to `f' at ./cc004.hs:15
     In the first argument of `thenADR', namely `_ccall_ f'
-    in the definition of function `bar':
+    In the definition of `bar':
 	(_ccall_ f) `thenADR` (\ a -> return (a + 1))
 
-cc004.hs:15:
+./cc004.hs:15:
     Ambiguous type variable(s) `a' in the constraint `Num a'
-    arising from the literal `1' at cc004.hs:15
+    arising from the literal `1' at ./cc004.hs:15
     In the second argument of `(+)', namely `1'
     In the first argument of `return', namely `(a + 1)'

testsuite/tests/ghc-regress/ccall/should_fail/cc005.stderr

 
-cc005.hs:7:
+./cc005.hs:7:
     Unacceptable argument type in foreign declaration: Int#
-    When checking declaration:
-	foreign export _ccall "foo" foo :: Int# -> IO ()
+    When checking declaration: foreign export foo foo :: Int# -> IO ()
 
-cc005.hs:10:
+./cc005.hs:10:
     Unacceptable result type in foreign declaration: Int#
-    When checking declaration:
-	foreign export _ccall "bar" bar :: Int -> Int#
+    When checking declaration: foreign export bar bar :: Int -> Int#

testsuite/tests/ghc-regress/ccall/should_fail/run

-#!/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=. \
-   $*

testsuite/tests/ghc-regress/ccall/should_run/all.T

@@ -5,8 +5,6 @@ include ($confdir ++ "/../vanilla-test.T")
 --                 extra run flags
 --                 expected process return value, if not zero
 
-test "callback" { vtr("-fglasgow-exts -package lang -fvia-C callback_stub.o", 
-                     "", "") }
 test "fed001"   { vtr("-fglasgow-exts -package lang", 
                      "", "") }
 test "ffi001"   { vtr("-fglasgow-exts -package lang", 

testsuite/tests/ghc-regress/ccall/should_run/callback.hs

-module Main (main, hputc) where
-
-import IO
-
-main = _casm_GC_ ``rts_evalIO(
-			rts_apply(
-		  	  &Main_hputc_closure,
-		  	  rts_mkChar('x')
-			  ),
-		        NULL
-	     	   );'' :: IO ()
-
-hputc :: Char -> IO ()
-hputc c = hPutChar stdout c >> hPutChar stdout '\n'
-
-foreign export hputc :: Char -> IO ()

testsuite/tests/ghc-regress/ccall/should_run/callback.stdout

-x

testsuite/tests/ghc-regress/ccall/should_run/run

-#!/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=. \
-   $*

testsuite/tests/ghc-regress/codeGen/should_compile/run

-#!/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=. \
-   $*

testsuite/tests/ghc-regress/concurrent/should_run/all.T

@@ -11,9 +11,6 @@ def myvtr ( $args_c, $args_r, $ret_res )
          $args_r, $ret_res )
 }
 
---conc009_RUNTEST_OPTS = -x 1
---conc021_RUNTEST_OPTS = -x 250 -o2 conc021.stderr-mingw
-
 test "conc001" { myvtr("", "", "") }
 test "conc002" { myvtr("", "", "") }
 test "conc003" { myvtr("", "", "") }
@@ -22,7 +19,7 @@ test "conc005" { myvtr("", "", "") }
 test "conc006" { myvtr("", "", "") }
 test "conc007" { myvtr("", "+RTS -H128M -RTS", "") }
 test "conc008" { myvtr("", "", "") }
-test "conc009" { myvtr("", "", "") }
+test "conc009" { myvtr("", "", "1") }
 test "conc010" { myvtr("", "", "") }
 test "conc012" { myvtr("", "", "") }
 test "conc013" { myvtr("", "", "") }
@@ -34,11 +31,11 @@ test "conc018" { myvtr("", "", "") }
 test "conc019" { myvtr("", "", "") }
 
 --# conc020 *should* work on mingw32
-test "conc020" { skip when $platform == "i386-unknown-mingw32"
+test "conc020" { skip when $os == "mingw32"
                  myvtr("", "", "") }
 
-test "conc021" { skip when $platform == "i386-unknown-mingw32"
-                 myvtr("", "", "") }
+test "conc021" { skip when $os == "mingw32"
+                 myvtr("", "", "250") }
 
 test "conc022" { myvtr("", "", "") }
 test "conc023" { myvtr("", "", "") }

testsuite/tests/ghc-regress/concurrent/should_run/conc021.stderr

-conc021.bin: main thread exited (uncaught exception)
+conc021: main thread exited (uncaught exception)

testsuite/tests/ghc-regress/concurrent/should_run/run

-#!/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=. \
-   $*

testsuite/tests/ghc-regress/deSugar/should_compile/run

-#!/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=. \
-   $*

testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stderr

 
-Fail: dsrun005.hs:42: Non-exhaustive patterns in function f
+Fail: ./dsrun005.hs:42: Non-exhaustive patterns in function f
 
 

testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.stderr

 
-Fail: dsrun007.hs:5: Missing field in record construction 
+Fail: ./dsrun007.hs:5: Missing field in record construction 
 
 

testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr

 
-drvfail004.hs:5:
+./drvfail004.hs:5:
     Could not deduce `Eq (Foo a b)' from the context (Ord a, Ord b)
     Probable fix:
 	Add `Eq (Foo a b)' to the instance declaration context
 	Or add an instance declaration for `Eq (Foo a b)'
-    arising from an instance declaration at drvfail004.hs:5
+    arising from the instance declaration at ./drvfail004.hs:5
+    In the instance declaration for `Ord (Foo a b)'