More fixes for 605, and adjust expected output
This commit is contained in:
parent
6c122b67c4
commit
5dbfa70f74
@ -8,9 +8,6 @@ apipath = "../api"
|
||||
|
||||
main = do
|
||||
status <- makeWith conf stub ["-i"++apipath]
|
||||
print status
|
||||
return ()
|
||||
{-
|
||||
o <- case status of
|
||||
MakeFailure e -> mapM_ putStrLn e >> error "failed"
|
||||
MakeSuccess _ o -> return o
|
||||
@ -23,4 +20,3 @@ main = do
|
||||
putStrLn user_editor
|
||||
makeCleaner o
|
||||
|
||||
-}
|
||||
|
7
examples/dynload/should_fail_2/prog/expected.605
Normal file
7
examples/dynload/should_fail_2/prog/expected.605
Normal file
@ -0,0 +1,7 @@
|
||||
|
||||
../Plugin.in:13:15:
|
||||
Couldn't match `Dynamic' against `(a, b)'
|
||||
Expected type: Dynamic
|
||||
Inferred type: (a, b)
|
||||
In the definition of `resource_dyn': resource_dyn = (typeOf v, unsafeCoerce v)
|
||||
failed
|
8
examples/dynload/should_fail_3/prog/expected.605
Normal file
8
examples/dynload/should_fail_3/prog/expected.605
Normal file
@ -0,0 +1,8 @@
|
||||
|
||||
../Plugin.in:12:15:
|
||||
Couldn't match `Dynamic' against `(a, b)'
|
||||
Expected type: Dynamic
|
||||
Inferred type: (a, b)
|
||||
In the definition of `resource_dyn':
|
||||
resource_dyn = (typeOf plugin, unsafeCoerce v)
|
||||
a.out: failed
|
@ -13,8 +13,6 @@
|
||||
import System.Eval
|
||||
import AltData.Dynamic
|
||||
|
||||
pkgconf = TOP ++ "/plugins.conf.inplace"
|
||||
|
||||
main = do
|
||||
a <- return $ toDyn (3::Integer)
|
||||
|
||||
@ -22,8 +20,8 @@ main = do
|
||||
-- looks like with GHC 6.4, we need to make sure the package.confs work:
|
||||
m_b <- unsafeEval_ "\\dyn -> fromDyn dyn (7 :: Integer)"
|
||||
["AltData.Dynamic"]
|
||||
[ "-package-conf "++pkgconf , "-package altdata" ]
|
||||
[ pkgconf ]
|
||||
[ ]
|
||||
[ ]
|
||||
[]
|
||||
|
||||
case m_b of
|
||||
|
5
examples/iface/null/expected.605
Normal file
5
examples/iface/null/expected.605
Normal file
@ -0,0 +1,5 @@
|
||||
interface "unknown" Main
|
||||
module dependencies: A, B
|
||||
package dependencies: base-1.0, plugins-0.9.10
|
||||
import B
|
||||
import A
|
9
examples/pdynload/spj3/prog/expected.605
Normal file
9
examples/pdynload/spj3/prog/expected.605
Normal file
@ -0,0 +1,9 @@
|
||||
|
||||
../Plugin.hs:5:31:
|
||||
Couldn't match the rigid variable `a' against `Int'
|
||||
`a' is bound by the polymorphic type `forall a. (Num a) => a -> a -> a'
|
||||
at ../Plugin.hs:5:11-56
|
||||
Expected type: a -> a -> a
|
||||
Inferred type: Int -> Int -> Int
|
||||
In the expression: (+) :: Int -> Int -> Int
|
||||
In the `function' field of a record
|
@ -239,8 +239,6 @@ build src obj extra_opts = do
|
||||
#endif
|
||||
|
||||
(out,err) <- exec ghc flags -- this is a fork()
|
||||
print $ "OUT = " ++ show out
|
||||
print $ "ERR = " ++ show err
|
||||
|
||||
obj_exists <- doesFileExist obj -- sanity
|
||||
return $ if not obj_exists && null err -- no errors, but no object?
|
||||
|
Loading…
x
Reference in New Issue
Block a user