diff --git a/tests/PackageTests/TestStanza/Check.hs b/tests/PackageTests/TestStanza/Check.hs index f168f792ff2abab509ec5f6d224c9bdfc8ded86d..35853a5ef661fe42aedd4c743211ccb2cdca8fc9 100644 --- a/tests/PackageTests/TestStanza/Check.hs +++ b/tests/PackageTests/TestStanza/Check.hs @@ -13,6 +13,7 @@ import Distribution.Package ( PackageIdentifier(..), PackageName(..), Dependency(..) ) import Distribution.PackageDescription ( PackageDescription(..), BuildInfo(..), TestSuite(..), Library(..) + , TestSuiteInterface(..) , TestType(..), emptyPackageDescription, emptyBuildInfo, emptyLibrary , emptyTestSuite, BuildType(..) ) import Distribution.Verbosity (silent) @@ -47,7 +48,7 @@ suite cabalVersion = TestCase $ do , stability = "stable" , description = "Check that Cabal recognizes the Test stanza defined below." , category = "PackageTests" - , descCabalVersion = anyVersion + , specVersionRaw = Right anyVersion , buildType = Just Simple , buildDepends = [ Dependency (PackageName "base") anyV ] @@ -61,7 +62,7 @@ suite cabalVersion = TestCase $ do } , testSuites = [ emptyTestSuite { testName = "dummy" - , testType = ExeTest (Version [1,0] []) "dummy.hs" + , testInterface = TestSuiteExeV10 (Version [1,0] []) "dummy.hs" , testBuildInfo = emptyBuildInfo { targetBuildDepends = [ Dependency (PackageName "base") anyVersion ] @@ -75,4 +76,4 @@ suite cabalVersion = TestCase $ do (unlines $ map (show . disp) xs) in assertEqual depMessage True False Right (f, _) -> assertEqual "parsed package description does not match anticipated" - f anticipatedFinalPD \ No newline at end of file + f anticipatedFinalPD diff --git a/tests/suite.hs b/tests/suite.hs index c9307e245d1c6ae7ff0cce7f467d00d345639fde..afbf3b484f3e6127a9332c24628840299f9ee3af 100644 --- a/tests/suite.hs +++ b/tests/suite.hs @@ -26,6 +26,7 @@ import PackageTests.TestStanza.Check import Distribution.Text (display) import Distribution.Simple.Utils (cabalVersion) import Data.Version +import System.Directory hunit :: TestName -> HUnit.Test -> Test hunit name test = testGroup name $ hUnitTestToTests test