@@ -15,7 +15,7 @@ testsDir :: IO (FilePath, FilePath)
1515-------------------------------------------------------------------------------
1616testsDir = do
1717 baseDir <- getCurrentDirectory
18− return (baseDir </> "objc-tests", baseDir)
18+ return (baseDir </> "purescript-tests", baseDir)
1919
2020-------------------------------------------------------------------------------
2121runTests :: IO ()
@@ -31,7 +31,7 @@ runTests = do
3131 let srcDir = outputDir </> "src"
3232 createDirectory srcDir
3333
34− let passingDir = baseDir </> "examples" </> "passing"
34+ let passingDir = baseDir </> "tests" </> "purs" </> "passing"
3535 passingTestCases <- sort . filter (".purs" `isSuffixOf`) <$> getDirectoryContents passingDir
3636
3737 -- Auto-generate Makefile
@@ -39,6 +39,10 @@ runTests = do
3939 callProcess "cp" ["../Makefile", "."]
4040
4141 fetchPackages
42+ callProcess "git" ["clone", "https://github.com/andyarvanitis/purescript-cpp-ffi.git", "ffi"]
43+
44+ callProcess "rm" ["-rf", ".psc-package/psc-0.12.0/prelude/v4.0.0"]
45+ callProcess "git" ["clone", "https://github.com/andyarvanitis/purescript-prelude.git", ".psc-package/psc-0.12.0/prelude/v4.0.0"]
4246
4347 let tests = filter (`notElem` skipped) passingTestCases
4448
@@ -62,7 +66,7 @@ runTests = do
6266 when testCaseDirExists $ callProcess "cp" ["-R", testCaseDir, srcDir]
6367
6468 callProcess "make" ["clean"]
65− callProcess "make" ["release", "-j12"]
69+ callProcess "make" ["debug", "-j12"]
6670 --
6771 -- Run C++ files
6872 --
@@ -80,7 +84,7 @@ runTests = do
8084 --
8185
8286 setCurrentDirectory baseDir
83− putStrLn "objc-tests finished"
87+ putStrLn "PureScript tests finished"
8488 putStrLn $ "Total tests available: " ++ show (length passingTestCases)
8589 putStrLn $ "Tests run: " ++ show (length tests)
8690 putStrLn $ "Tests skipped: " ++ show (length skipped)
@@ -89,23 +93,21 @@ runTests = do
8993packages :: [String]
9094-------------------------------------------------------------------------------
9195packages =
92− [ "eff"
93− , "arrays"
96+ [ "arrays"
9497 , "assert"
9598 , "console"
9699 , "control"
100+ , "effect"
97101 , "foldable-traversable"
98102 , "functions"
99103 , "generics-rep"
100104 , "invariant"
101− , "monoid"
102105 , "newtype"
103106 , "partial"
104107 , "prelude"
105108 , "proxy"
106109 , "refs"
107110 , "st"
108− , "symbols"
109111 , "type-equality"
110112 , "typelevel-prelude"
111113 ]
@@ -123,16 +125,14 @@ skipped :: [String]
123125-------------------------------------------------------------------------------
124126skipped =
125127 [
126− "NumberLiterals.purs" -- unreliable float comparison, test manually
127− , "2172.purs" -- ps-side foreign issue
128− , "AppendInReverse.purs" -- test not updated to post-0.12?
129− , "EffFn.purs" -- ps-side foreign issue
128+ "EffFn.purs" -- ps-side foreign issue
129+ , "FunWithFunDeps.purs" -- requires FFI
130130 , "MultiArgFunctions.purs" -- not supported (needed?) right now
131− , "NegativeIntInRange.purs" -- supposed to fail?
131+ , "NegativeIntInRange.purs" -- C++ literal restriction
132+ , "NumberLiterals.purs" -- unreliable float comparison, test manually
132133 , "PolyLabels.purs" -- ps-side foreign issue
133134 , "RowUnion.purs" -- ps-side foreign issue
134135 , "ShadowedModuleName.purs" -- ?
135− , "FunWithFunDeps.purs" -- requires FFI
136136 , "StringEdgeCases.purs" -- ?
137137 , "StringEscapes.purs" -- TODO: UTF16-specific?
138138 ]
@@ -141,4 +141,4 @@ logpath :: FilePath
141141logpath = "purescript-output"
142142
143143logfile :: FilePath
144−logfile = "objc-tests.out"
144+logfile = "purescript-tests.out"