Merge testsuites into one

Author: sjakobi

tests/Regressions.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE UnboxedTuples #-}
-module Main where
+module Regressions (tests) where
 
 import Control.Exception (evaluate)
 import Control.Monad (replicateM)
@@ -16,7 +16,7 @@ import System.Mem (performGC)
 import System.Mem.Weak (mkWeakPtr, deRefWeak)
 import System.Random (randomIO)
 import Test.HUnit (Assertion, assert)
-import Test.Tasty (TestTree, defaultMain, testGroup)
+import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.HUnit (testCase)
 import Test.Tasty.QuickCheck (testProperty)
 import Test.QuickCheck
@@ -135,9 +135,3 @@ tests = testGroup "Regression tests"
     , testCase "issue254 lazy" issue254Lazy
     , testCase "issue254 strict" issue254Strict
     ]
-
-------------------------------------------------------------------------
--- * Test harness
-
-main :: IO ()
-main = defaultMain tests

tests/Strictness.hs

@@ -1,11 +1,11 @@
 {-# LANGUAGE CPP, FlexibleInstances, GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
-module Main (main) where
+module Strictness (tests) where
 
 import Data.Hashable (Hashable(hashWithSalt))
 import Test.ChasingBottoms.IsBottom
-import Test.Tasty (TestTree, defaultMain, testGroup)
+import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 import Test.QuickCheck (Arbitrary(arbitrary), Property, (===), (.&&.))
 import Test.QuickCheck.Function
@@ -175,12 +175,6 @@ tests = testGroup "Strictness tests"
       ]
     ]
 
-------------------------------------------------------------------------
--- * Test harness
-
-main :: IO ()
-main = defaultMain tests
-
 ------------------------------------------------------------------------
 -- * Utilities
 

unordered-containers.cabal

@@ -189,6 +189,31 @@ test-suite strictness-properties
   ghc-options: -Wall
   cpp-options: -DASSERTS
 
+test-suite unordered-containers-tests
+  hs-source-dirs: tests
+  main-is: Main.hs
+  type: exitcode-stdio-1.0
+  other-modules:
+    Regressions
+    Strictness
+
+  build-depends:
+    base,
+    ChasingBottoms,
+    containers >= 0.4.2,
+    hashable >= 1.0.1.1,
+    HUnit,
+    QuickCheck >= 2.4.0.1,
+    random,
+    tasty >= 1.4.0.3,
+    tasty-hunit >= 0.10.0.3,
+    tasty-quickcheck >= 0.10.1.2,
+    unordered-containers
+
+  default-language: Haskell2010
+  ghc-options: -Wall
+  cpp-options: -DASSERTS
+
 benchmark benchmarks
   hs-source-dirs: benchmarks
   main-is: Benchmarks.hs