Refactor tests to centralise the test main for CI

.gitignore

@@ -42,7 +42,6 @@ dist-package/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

build_config/stack-local.yaml

@@ -17,6 +17,7 @@ packages:
     - location: ../project
     - location: ../syntax/text/parser
     - location: ../syntax/text/lexer
+    - location: ../lib/ci
     - location: ../../libs/container
     - location: ../../libs/convert
     - location: ../../libs/data-base

core/package.yaml

@@ -32,6 +32,7 @@ tests:
         source-dirs: test/spec
         dependencies:
             - luna-core
+            - luna-ci
             - directory
             - filepath
             - hspec

core/test/spec/Main.hs

@@ -2,28 +2,10 @@ module Main where
 
 import Prelude
 
-import Data.Maybe         (fromJust, isJust)
-import System.Directory   (createDirectoryIfMissing)
-import System.Environment (lookupEnv)
-import System.FilePath    ((</>))
+import qualified Luna.CI as CI
 
-import Test.Hspec.Runner
-import Test.Hspec.Formatters.Jenkins
 import qualified Spec
 
-
 main :: IO ()
-main = do
-    buildInCI <- isJust <$> lookupEnv "CIRCLECI"
-
-    config <-
-        if buildInCI then do
-            -- if in CI, CIRCLE_TEST_REPORTS is always defined
-            circleTestPath <- fmap fromJust $ lookupEnv "CIRCLE_TEST_REPORTS"
-            let testPath = circleTestPath </> "hspec"
-            createDirectoryIfMissing True testPath
-            return $ defaultConfig { configFormatter = Just xmlFormatter
-                                   , configOutputFile = Right $ testPath </> "output.xml" }
-        else return defaultConfig
+main = CI.main Spec.spec
 
-    hspecWith config Spec.spec

lib/ci/package.yaml

@@ -0,0 +1,62 @@
+name:       luna-ci
+version:    "0.1"
+author:     Luna Team <contact@luna-lang.org>
+maintainer: Luna Team <contact@luna-lang.org>
+
+library:
+    source-dirs:
+        - src
+
+dependencies:
+    - base
+    - hspec
+    - hspec-jenkins
+    - directory
+    - filepath
+
+default-extensions:
+    - AllowAmbiguousTypes
+    - ApplicativeDo
+    - Arrows
+    - BangPatterns
+    - BinaryLiterals
+    - ConstraintKinds
+    - DataKinds
+    - DefaultSignatures
+    - DeriveDataTypeable
+    - DeriveFoldable
+    - DeriveFunctor
+    - DeriveGeneric
+    - DeriveTraversable
+    - DoAndIfThenElse
+    - DuplicateRecordFields
+    - EmptyDataDecls
+    - FlexibleContexts
+    - FlexibleInstances
+    - FunctionalDependencies
+    - GeneralizedNewtypeDeriving
+    - InstanceSigs
+    - LambdaCase
+    - MonadComprehensions
+    - MultiWayIf
+    - NamedWildCards
+    - NegativeLiterals
+    - NoImplicitPrelude
+    - NumDecimals
+    - OverloadedLabels
+    - PackageImports
+    - QuasiQuotes
+    - RankNTypes
+    - RecursiveDo
+    - ScopedTypeVariables
+    - StandaloneDeriving
+    - TemplateHaskell
+    - TupleSections
+    - TypeApplications
+    - TypeFamilies
+    - TypeFamilyDependencies
+    - TypeOperators
+    - ViewPatterns
+
+    - LiberalTypeSynonyms
+    - RelaxedPolyRec

lib/ci/src/Luna/CI.hs

@@ -0,0 +1,29 @@
+module Luna.CI where
+
+import Prelude
+
+import Data.Maybe         (fromJust, isJust)
+import System.Directory   (createDirectoryIfMissing)
+import System.Environment (lookupEnv)
+import System.FilePath    ((</>))
+
+import Test.Hspec
+import Test.Hspec.Runner
+import Test.Hspec.Formatters.Jenkins
+
+main :: Spec -> IO ()
+main spec = do
+    buildInCI <- isJust <$> lookupEnv "CIRCLECI"
+
+    config <-
+        if buildInCI then do
+            -- if in CI, CIRCLE_TEST_REPORTS is always defined
+            circleTestPath <- fmap fromJust $ lookupEnv "CIRCLE_TEST_REPORTS"
+            let testPath = circleTestPath </> "hspec"
+            createDirectoryIfMissing True testPath
+            return $ defaultConfig { configFormatter = Just xmlFormatter
+                                   , configOutputFile = Right $ testPath </> "output.xml" }
+        else return defaultConfig
+
+    hspecWith config spec
+

passes/package.yaml

@@ -26,6 +26,7 @@ tests:
             - luna-parser
             - luna-lexer
             - luna-stdlib
+            - luna-ci
             - directory
             - filepath
             - hspec

passes/test/spec/Main.hs

@@ -2,28 +2,10 @@ module Main where
 
 import Prelude
 
-import Data.Maybe         (fromJust, isJust)
-import System.Directory   (createDirectoryIfMissing)
-import System.Environment (lookupEnv)
-import System.FilePath    ((</>))
+import qualified Luna.CI as CI
 
-import Test.Hspec.Runner
-import Test.Hspec.Formatters.Jenkins
 import qualified Spec
 
-
 main :: IO ()
-main = do
-    buildInCI <- isJust <$> lookupEnv "CIRCLECI"
-
-    config <-
-        if buildInCI then do
-            -- if in CI, CIRCLE_TEST_REPORTS is always defined
-            circleTestPath <- fmap fromJust $ lookupEnv "CIRCLE_TEST_REPORTS"
-            let testPath = circleTestPath </> "hspec"
-            createDirectoryIfMissing True testPath
-            return $ defaultConfig { configFormatter = Just xmlFormatter
-                                   , configOutputFile = Right $ testPath </> "output.xml" }
-        else return defaultConfig
+main = CI.main Spec.spec
 
-    hspecWith config Spec.spec

stack.yaml

@@ -17,4 +17,5 @@ packages:
     - location: project
     - location: syntax/text/parser
     - location: syntax/text/lexer
+    - location: lib/ci
 resolver: ./build_config/luna-snapshot.yaml

syntax/text/parser/package.yaml

@@ -16,14 +16,14 @@ tests:
             - luna-core
             - luna-parser
             - luna-lexer
+            - luna-ci
             - directory
             - filepath
             - hspec
             - hspec-megaparsec
             - hspec-jenkins
             - open-browser
 
-
 dependencies:
     - base
     - luna-core

syntax/text/parser/test/spec/Main.hs

@@ -2,28 +2,10 @@ module Main where
 
 import Prelude
 
-import Data.Maybe         (fromJust, isJust)
-import System.Directory   (createDirectoryIfMissing)
-import System.Environment (lookupEnv)
-import System.FilePath    ((</>))
+import qualified Luna.CI as CI
 
-import Test.Hspec.Runner
-import Test.Hspec.Formatters.Jenkins
 import qualified Spec
 
-
 main :: IO ()
-main = do
-    buildInCI <- isJust <$> lookupEnv "CIRCLECI"
-
-    config <-
-        if buildInCI then do
-            -- if in CI, CIRCLE_TEST_REPORTS is always defined
-            circleTestPath <- fmap fromJust $ lookupEnv "CIRCLE_TEST_REPORTS"
-            let testPath = circleTestPath </> "hspec"
-            createDirectoryIfMissing True testPath
-            return $ defaultConfig { configFormatter = Just xmlFormatter
-                                   , configOutputFile = Right $ testPath </> "output.xml" }
-        else return defaultConfig
+main = CI.main Spec.spec
 
-    hspecWith config Spec.spec