git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #1402 from purescript/1401-windows-tests

Fixes running tests on Windows

commitb2a8cf2bd1a4aab729ccf6735c294e4609b7d7bb authorGary Burgess <gary.burgess@gmail.com> dateMon 24 Aug 2015, 17:09 (11 years ago) parente8ccaecd6ce2c5
4 files changed+14−5
compare with golang
unifiedsplit
purescript.cabal+2−1 tests/Main.hs+1 tests/common/TestsSetup.hs+8−4 tests/support/setup-win.cmd+3
purescript.cabal+2−1
@@ -23,6 +23,7 @@ extra-source-files: examples/passing/*.purs
2323 , tests/support/setup.js
2424 , tests/support/package.json
2525 , tests/support/bower.json
26+ , tests/support/setup-win.cmd
2627 , psci/tests/data/Sample.purs
2728
2829source-repository head
@@ -122,7 +123,7 @@ library
122123 Language.PureScript.Sugar.ObjectWildcards
123124 Language.PureScript.Sugar.Operators
124125 Language.PureScript.Sugar.TypeClasses
125− Language.PureScript.Sugar.TypeClasses.Deriving
126+ Language.PureScript.Sugar.TypeClasses.Deriving
126127 Language.PureScript.Sugar.TypeDeclarations
127128 Language.PureScript.Traversals
128129 Language.PureScript.TypeChecker
tests/Main.hs+1
@@ -62,6 +62,7 @@ import System.Exit
6262import System.Process
6363import System.FilePath
6464import System.Directory
65+import qualified System.Info
6566import qualified System.FilePath.Glob as Glob
6667
6768import Text.Parsec (ParseError)
tests/common/TestsSetup.hs+8−4
@@ -23,6 +23,7 @@ import Control.Monad.Trans.Maybe
2323
2424import System.Process
2525import System.Directory
26+import System.Info
2627
2728findNodeProcess :: IO (Maybe String)
2829findNodeProcess = runMaybeT . msum $ map (MaybeT . findExecutable) names
@@ -33,9 +34,12 @@ fetchSupportCode :: IO ()
3334fetchSupportCode = do
3435 node <- fromMaybe (error "cannot find node executable") <$> findNodeProcess
3536 setCurrentDirectory "tests/support"
36− callProcess "npm" ["install"]
37− -- Sometimes we run as a root (e.g. in simple docker containers)
38− -- And we are non-interactive: https://github.com/bower/bower/issues/1162
39− callProcess "node_modules/.bin/bower" ["--allow-root", "install", "--config.interactive=false"]
37+ if System.Info.os == "mingw32"
38+ then callProcess "setup-win.cmd" []
39+ else do
40+ callProcess "npm" ["install"]
41+ -- Sometimes we run as a root (e.g. in simple docker containers)
42+ -- And we are non-interactive: https://github.com/bower/bower/issues/1162
43+ callProcess "node_modules/.bin/bower" ["--allow-root", "install", "--config.interactive=false"]
4044 callProcess node ["setup.js"]
4145 setCurrentDirectory "../.."
tests/support/setup-win.cmdnew file+3
@@ -0,0 +1,3 @@
1+@echo off
2+call npm install
3+call node_modules\.bin\bower install --config.interactive=false