cosmetic, get ready to migrate to libraries/

tests/compiler/LibTest.hs

@@ -12,19 +12,38 @@ import Elm.Internal.Paths as Elm
 main :: IO ()
 main = do
   top <- getCurrentDirectory
-  let ioScript s = top</>"IO"</>s
-  runCmd "git submodule update --init"
+
+  -- setup submodules and npm
+  runCmd "git" ["submodule", "update", "--init"]
   out <- readProcess "npm" ["ls", "--parseable"] ""
-  unless ("jsdom" `isInfixOf` out) $ runCmd "npm install jsdom"
-  setCurrentDirectory $ top</>"tests"</>"elm"
-  runCmd $ concat [top</>"dist"</>"build"</>"elm"</>"elm --make --only-js --src-dir=" , top</>"automaton", " --src-dir=", top</>"IO", " --src-dir=", top</>"Elm-Test", " Test.elm"]
-  runCmd $ unwords ["cat ", ioScript "prescript.js", Elm.runtime, "build"</>"Test.js", ioScript "handler.js", "> exe.js"]
+  unless ("jsdom" `isInfixOf` out) $ runCmd "npm" ["install","jsdom"]
+
+  -- setup actual library tests
+  setCurrentDirectory $ top </> "tests" </> "libraries"
+  let localCompiler = joinPath [ top, "dist", "build", "elm", "elm" ]
+  runCmd localCompiler [ "--make"
+                       , "--only-js"
+                       , "--src-dir=" ++ top </> "automaton"
+                       , "--src-dir=" ++ top </> "IO"
+                       , "--src-dir=" ++ top </> "Elm-Test"
+                       , "Test.elm"
+                       ]
+
+  -- run tests
+  let ioScript s = top </> "IO" </> s
+      files = [ ioScript "prescript.js"
+              , Elm.runtime
+              , "build" </> "Test.js"
+              , ioScript "handler.js"
+              ]
+  exe <- readProcess "cat" files ""
+  writeFile "exe.js" exe
   exitWith =<< waitForProcess =<< (runCommand "node exe.js")
-  where runCmd cmd = do
-          putStrLn cmd
-          exitCode <- waitForProcess =<< runCommand cmd
-          case exitCode of
-            ExitSuccess   -> return ()
-            ExitFailure _ -> error "something went wrong"
 
-
+runCmd :: String -> [String] -> IO ()
+runCmd cmd args = do
+  putStrLn (cmd ++ " " ++ unwords args)
+  (exitCode, _stdout, stderr) <- readProcessWithExitCode cmd args ""
+  case exitCode of
+    ExitSuccess   -> return ()
+    ExitFailure _ -> error stderr