X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/44be51aaff963774aafa45cfb36481c13e5185cb..dc4b5c42b9f607bcbdcb1cb4fe72d2ad2ce065f5:/htest/test.hs

diff --git a/htest/test.hs b/htest/test.hs
index d7eb780..eade8bf 100644
--- a/htest/test.hs
+++ b/htest/test.hs
@@ -30,23 +30,25 @@ import Test.Framework
 import System.Environment (getArgs)
 
 import Test.Ganeti.TestImports ()
+import Test.Ganeti.Attoparsec
 import Test.Ganeti.BasicTypes
-import Test.Ganeti.Confd.Utils
+import Test.Ganeti.Block.Drbd.Parser
 import Test.Ganeti.Common
+import Test.Ganeti.Confd.Utils
 import Test.Ganeti.Daemon
+import Test.Ganeti.Errors
+import Test.Ganeti.HTools.Backend.Simu
+import Test.Ganeti.HTools.Backend.Text
 import Test.Ganeti.HTools.CLI
 import Test.Ganeti.HTools.Cluster
 import Test.Ganeti.HTools.Container
-import Test.Ganeti.HTools.Loader
 import Test.Ganeti.HTools.Instance
+import Test.Ganeti.HTools.Loader
 import Test.Ganeti.HTools.Node
 import Test.Ganeti.HTools.PeerMap
-import Test.Ganeti.HTools.Simu
-import Test.Ganeti.HTools.Text
 import Test.Ganeti.HTools.Types
-import Test.Ganeti.HTools.Utils
-import Test.Ganeti.Jobs
 import Test.Ganeti.JSON
+import Test.Ganeti.Jobs
 import Test.Ganeti.Luxi
 import Test.Ganeti.Objects
 import Test.Ganeti.OpCodes
@@ -55,6 +57,9 @@ import Test.Ganeti.Query.Language
 import Test.Ganeti.Query.Query
 import Test.Ganeti.Rpc
 import Test.Ganeti.Ssconf
+import Test.Ganeti.THH
+import Test.Ganeti.Types
+import Test.Ganeti.Utils
 
 -- | Our default test options, overring the built-in test-framework
 -- ones (but not the supplied command line parameters).
@@ -69,12 +74,17 @@ defOpts = TestOptions
        }
 
 -- | All our defined tests.
-allTests :: [(String, [Test])]
+allTests :: [Test]
 allTests =
   [ testBasicTypes
+  , testAttoparsec
   , testCommon
   , testConfd_Utils
   , testDaemon
+  , testBlock_Drbd_Parser
+  , testErrors
+  , testHTools_Backend_Simu
+  , testHTools_Backend_Text
   , testHTools_CLI
   , testHTools_Cluster
   , testHTools_Container
@@ -82,10 +92,7 @@ allTests =
   , testHTools_Loader
   , testHTools_Node
   , testHTools_PeerMap
-  , testHTools_Simu
-  , testHTools_Text
   , testHTools_Types
-  , testHTools_Utils
   , testJSON
   , testJobs
   , testLuxi
@@ -96,6 +103,9 @@ allTests =
   , testQuery_Query
   , testRpc
   , testSsconf
+  , testTHH
+  , testTypes
+  , testUtils
   ]
 
 -- | Main function. Note we don't use defaultMain since we want to
@@ -104,5 +114,4 @@ main :: IO ()
 main = do
   ropts <- getArgs >>= interpretArgsOrExit
   let opts = maybe defOpts (defOpts `mappend`) $ ropt_test_options ropts
-      tests = map (uncurry testGroup) allTests
-  defaultMainWithOpts tests (ropts { ropt_test_options = Just opts })
+  defaultMainWithOpts allTests (ropts { ropt_test_options = Just opts })