1 files changed, 21 insertions, 25 deletions
diff --git a/bittorrent.cabal b/bittorrent.cabal
index ae1a06a4..7f59637e 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -130,12 +130,12 @@ library
  ghc-prof-options:
-test-suite properties
+test-suite spec
  default-language:    Haskell2010
-  default-extensions:
+  default-extensions:  OverloadedStrings
  type:                exitcode-stdio-1.0
  hs-source-dirs:      tests
-  main-is:             Main.hs
+  main-is:             Spec.hs
  build-depends:       base == 4.*
                     , bytestring
                     , directory
@@ -146,32 +146,28 @@ test-suite properties
                     , network
                     , text
+                     , hspec
                     , QuickCheck
-                     , HUnit
+                     , quickcheck-instances
-                     , test-framework
-                     , test-framework-quickcheck2
-                     , test-framework-hunit
                     , bencoding
                     , bittorrent
  ghc-options:         -Wall -fno-warn-orphans
-benchmark benchmarks
+--benchmark bench
-  default-language:    Haskell2010
+--  default-language:    Haskell2010
-  default-extensions:
+--  default-extensions:
-  type:                exitcode-stdio-1.0
+--  type:                exitcode-stdio-1.0
-  hs-source-dirs:      bench
+--  hs-source-dirs:      bench
-  main-is:             Main.hs
+--  main-is:             Main.hs
-  build-depends:       base
+--  build-depends:       base
-                     , bytestring
+--                     , bytestring
-                     , cereal
+--                     , cereal
-                     , network
+--                     , network
+--
-                     , criterion
+--                     , criterion
-                     , deepseq
+--                     , deepseq
+--
-                     , bittorrent
+--                     , bittorrent
+--  ghc-options:         -O2 -Wall -fno-warn-orphans
-  ghc-options:         -O2 -Wall -fno-warn-orphans

diff --git a/bittorrent.cabal b/bittorrent.cabal index ae1a06a4..7f59637e 100644 --- a/bittorrent.cabal +++ b/bittorrent.cabal
@@ -130,12 +130,12 @@ library
130	ghc-prof-options:	130	ghc-prof-options:
131		131
132		132
133	test-suite properties	133	test-suite spec
134	default-language: Haskell2010	134	default-language: Haskell2010
135	default-extensions:	135	default-extensions: OverloadedStrings
136	type: exitcode-stdio-1.0	136	type: exitcode-stdio-1.0
137	hs-source-dirs: tests	137	hs-source-dirs: tests
138	main-is: Main.hs	138	main-is: Spec.hs
139	build-depends: base == 4.*	139	build-depends: base == 4.*
140	, bytestring	140	, bytestring
141	, directory	141	, directory
@@ -146,32 +146,28 @@ test-suite properties
146	, network	146	, network
147	, text	147	, text
148		148
		149	, hspec
149	, QuickCheck	150	, QuickCheck
150	, HUnit	151	, quickcheck-instances
151	, test-framework
152	, test-framework-quickcheck2
153	, test-framework-hunit
154		152
155	, bencoding	153	, bencoding
156	, bittorrent	154	, bittorrent
157
158	ghc-options: -Wall -fno-warn-orphans	155	ghc-options: -Wall -fno-warn-orphans
159		156
160		157
161	benchmark benchmarks	158	--benchmark bench
162	default-language: Haskell2010	159	-- default-language: Haskell2010
163	default-extensions:	160	-- default-extensions:
164	type: exitcode-stdio-1.0	161	-- type: exitcode-stdio-1.0
165	hs-source-dirs: bench	162	-- hs-source-dirs: bench
166	main-is: Main.hs	163	-- main-is: Main.hs
167	build-depends: base	164	-- build-depends: base
168	, bytestring	165	-- , bytestring
169	, cereal	166	-- , cereal
170	, network	167	-- , network
171		168	--
172	, criterion	169	-- , criterion
173	, deepseq	170	-- , deepseq
174		171	--
175	, bittorrent	172	-- , bittorrent
176		173	-- ghc-options: -O2 -Wall -fno-warn-orphans
177	ghc-options: -O2 -Wall -fno-warn-orphans