7 files changed, 11 insertions, 12 deletions

diff --git a/.gitmodules b/.gitmodules
index f35426da..1bc7a6d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "sub/krpc"]
         path = sub/krpc
         url = git://github.com/pxqr/krpc.git
-[submodule "sub/hspec"]
-        path = sub/hspec
-        url = https://github.com/DanielG/hspec.git
 [submodule "sub/optparse-applicative"]
         path = sub/optparse-applicative
         url = https://github.com/pcapriotti/optparse-applicative.git
diff --git a/.travis.yml b/.travis.yml
index afdb1238..68b7e213 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,8 @@ notifications:
   email: false
 
 install:
-  - git clone https://github.com/pxqr/bencoding.git
-  - cd bencoding
-  - cabal install --force-reinstalls
-  - cd ..
-  - cabal install --enable-tests --enable-benchmark --force-reinstalls --only-dependencies
+  - cabal sandbox init
+  - ./dev/update-dependencies.sh
 
 script:
-  cabal configure --enable-tests --enable-benchmark && cabal build && cabal test
\ No newline at end of file
+  - cabal configure --enable-tests --enable-benchmark && cabal build && ./dist/build/spec/spec
\ No newline at end of file
diff --git a/bittorrent.cabal b/bittorrent.cabal
index f72adb4b..80b128a2 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -252,7 +252,7 @@ test-suite spec
                      , filepath
 
                        -- * Testing
-                     , hspec >= 1.8.1.1
+                     , hspec >= 1.8.2
                      , QuickCheck
                      , quickcheck-instances
 
diff --git a/dev/update-dependencies.sh b/dev/update-dependencies.sh
index ebe78608..c83694c3 100755
--- a/dev/update-dependencies.sh
+++ b/dev/update-dependencies.sh
@@ -2,6 +2,10 @@
 
 cd $(dirname $0)/..
 
+git submodule init
 git submodule foreach git fetch
 git submodule update --recursive --checkout --force
+
+$(dirname $0)/add-sources.sh
+
 cabal install --enable-tests --only-dependencies --reinstall
diff --git a/sub/hspec b/sub/hspec
deleted file mode 160000
-Subproject 6b5bf6fe8bc59909c5b7346f6f70fdfe643d115
diff --git a/tests/Main.hs b/tests/Main.hs
index 6577e6f4..75321ec7 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -10,6 +10,7 @@ import System.Environment
 import System.Process
 import System.Directory
 import Text.Printf
+import Test.Hspec
 
 import Config
 import Spec
@@ -64,7 +65,7 @@ terminateEnv = do
 runTestSuite :: [String] -> IO ExitCode
 runTestSuite args = do
   printf "running hspec test suite with args: %s\n" (show args)
-  catch (withArgs args hspecMain >> return ExitSuccess) return
+  catch (withArgs args (hspec spec) >> return ExitSuccess) return
 
 main :: IO ()
 main = do
diff --git a/tests/Spec.hs b/tests/Spec.hs
index 8d2b5139..b4e92e75 100644
--- a/tests/Spec.hs
+++ b/tests/Spec.hs
@@ -1 +1 @@
-{-# OPTIONS_GHC -F -pgmF hspec-discover -optF --hook-main #-}
+{-# OPTIONS_GHC -F -pgmF hspec-discover -optF --no-main #-}