Don't use subdir project

Hexirp · Oct 7, 2017 · ca63fd8 · ca63fd8
1 parent ad125ad
commit ca63fd8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,11 +16,12 @@ before_install:
   - travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
 
 install:
-  - stack --no-terminal setup
+  - stack --no-terminal --install-ghc build --test --only-dependencies
 
 script:
-  - stack --no-terminal build doctest-driver-gen --test --haddock
-  - stack --no-terminal build ddgen-test         --test --haddock
+  - stack --no-terminal build
+  - stack --no-terminal test
+  - stack --no-terminal haddock
   - stack --no-terminal sdist
 
 cache:

diff --git a/doctest-driver-gen.cabal b/doctest-driver-gen.cabal
@@ -32,6 +32,16 @@ executable doctest-driver-gen
                      , doctest-driver-gen
   default-language:    Haskell2010
 
+test-suite doctest-driver-gen-test
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      test
+  main-is:             doctest-driver.hs
+  build-depends:       base
+                     , doctest
+                     , doctest-driver-gen
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  default-language:    Haskell2010
+
 source-repository head
   type:     git
   location: https://github.com/Hexirp/doctest-driver-gen
diff --git a/stack.yaml b/stack.yaml
@@ -37,7 +37,6 @@ resolver: lts-9.6
 # will not be run. This is useful for tweaking upstream packages.
 packages:
 - .
-- ./test
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)
 extra-deps: []

diff --git a/test/test/doctest-driver.hs → test/doctest-driver.hs b/test/test/doctest-driver.hs → test/doctest-driver.hs