Commit 51fa20ee authored by Michael Hanus's avatar Michael Hanus
Browse files

Fix for calling CurryCheck with non-zero CURRYPATH

parent 2d843e66
...@@ -66,7 +66,7 @@ ccBanner :: String ...@@ -66,7 +66,7 @@ ccBanner :: String
ccBanner = unlines [bannerLine,bannerText,bannerLine] ccBanner = unlines [bannerLine,bannerText,bannerLine]
where where
bannerText = "CurryCheck: a tool for testing Curry programs (Version " ++ bannerText = "CurryCheck: a tool for testing Curry programs (Version " ++
packageVersion ++ " of 03/01/2021)" packageVersion ++ " of 26/02/2021)"
bannerLine = take (length bannerText) (repeat '-') bannerLine = take (length bannerText) (repeat '-')
-- Help text -- Help text
...@@ -1676,13 +1676,15 @@ checkModules opts mods = do ...@@ -1676,13 +1676,15 @@ checkModules opts mods = do
showGeneratedModule opts "main test" testmodname showGeneratedModule opts "main test" testmodname
putStrIfNormal opts $ withColor opts blue $ "and compiling it...\n" putStrIfNormal opts $ withColor opts blue $ "and compiling it...\n"
let runcmd = unwords $ let runcmd = unwords $
[ installDir </> "bin" </> "curry" [ installDir </> "bin" </> "curry"
, "--noreadline" , "--noreadline" ] ++
, ":set -time" (if null currypath
, ":set " ++ if optVerb opts > 3 then "v1" else "v0" then []
, ":set parser -Wnone" else ["--nocypm", ":set path " ++ currypath]) ++
, if null currypath then "" else ":set path " ++ currypath [ ":set -time"
, ":l "++testmodname,":eval main :q" ] , ":set " ++ if optVerb opts > 3 then "v1" else "v0"
, ":set parser -Wnone"
, ":l "++testmodname,":eval main :q" ]
putStrLnIfDebug opts $ "Executing command:\n" ++ runcmd putStrLnIfDebug opts $ "Executing command:\n" ++ runcmd
ret <- system runcmd ret <- system runcmd
cleanup opts testmodname finaltestmodules cleanup opts testmodname finaltestmodules
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment