From 629c1ceb3a0c5cb74fc39792cbdd561421ffda40 Mon Sep 17 00:00:00 2001 From: dons Date: Sun, 25 Dec 2005 23:43:44 +0000 Subject: [PATCH] comments on the failing hier test from bayley --- testsuite/iface/null/expected.604 | 2 +- testsuite/pdynload/bayley1/Load.hs | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/testsuite/iface/null/expected.604 b/testsuite/iface/null/expected.604 index e467488..c05aa83 100644 --- a/testsuite/iface/null/expected.604 +++ b/testsuite/iface/null/expected.604 @@ -1,5 +1,5 @@ interface "unknown" Main module dependencies: A, B -package dependencies: base-1.0, plugins-0.9.10 +package dependencies: base-1.0, plugins-1.0 import B import A diff --git a/testsuite/pdynload/bayley1/Load.hs b/testsuite/pdynload/bayley1/Load.hs index 8ea3d0d..5dfca08 100644 --- a/testsuite/pdynload/bayley1/Load.hs +++ b/testsuite/pdynload/bayley1/Load.hs @@ -3,6 +3,13 @@ module Load where import API import System.Plugins +-- +-- load doesn't seem to behave nicely when using dirname on hier names +-- +-- make, and maybe other places, use dirname to work out various names +-- from paths, which is invalid when hier names are used.. +-- + testload = do s <- make "../Plugin1.hs" ["-i../api"] @@ -10,7 +17,7 @@ testload = do MakeSuccess _ o -> return o MakeFailure e -> mapM_ putStrLn e >> fail "o1" - s <- make "../Sub/Plugin2.hs" ["-i../api"] + s <- make "../Sub/Plugin2.hs" ["-i../api","-hidir.."] -- ! o2 <- case s of MakeSuccess _ o -> return o MakeFailure e -> mapM_ putStrLn e >> fail "o2" @@ -24,8 +31,9 @@ testload = do let s = proc 42 print s + -- will reqeust 'Plugin2', but module is actually 'Sub.Plugin2' print o2 - fc <- pdynload o2 ["..","../api"] [] "API.PluginAPI" "action" + fc <- pdynload (o2) ["..","../api"] [] "API.PluginAPI" "action" case fc of LoadFailure msg -> mapM_ putStrLn msg LoadSuccess modul proc -> do