From d0b28169f68d4b2e65809e71be01dbf6b875700b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 22 Nov 2012 12:20:32 +0200 Subject: [PATCH] Generate documentation --- Stackage/Config.hs | 12 ++++++++++++ Stackage/Test.hs | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index ea2b5556..fa03e05b 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -23,6 +23,18 @@ expectedFailures = fromList $ map PackageName -- Requires a special hspec-meta which is not yet available from -- Hackage. , "hspec" + + -- Requires markdown-unlit, which we don't want to depend on. + , "hspec-expectations" + + -- text and setenv have recursive dependencies in their tests, which + -- cabal can't (yet) handle + , "text" + , "setenv" + + -- The version of GLUT included with the HP does not generate + -- documentation correctly. + , "GLUT" ] -- | List of packages for our stable Hackage. All dependencies will be diff --git a/Stackage/Test.hs b/Stackage/Test.hs index e06513f1..03ddab15 100644 --- a/Stackage/Test.hs +++ b/Stackage/Test.hs @@ -43,7 +43,12 @@ runTestSuite testdir prevPassed pair@(packageName, _) = do else do ph4 <- getHandle AppendMode $ \handle -> runProcess "cabal-dev" ["test"] (Just dir) Nothing Nothing (Just handle) (Just handle) ec4 <- waitForProcess ph4 - return $ ec4 == ExitSuccess + if (ec4 /= ExitSuccess) + then return False + else do + ph5 <- getHandle AppendMode $ \handle -> runProcess "cabal-dev" ["haddock"] (Just dir) Nothing Nothing (Just handle) (Just handle) + ec5 <- waitForProcess ph5 + return $ ec5 == ExitSuccess let expectedFailure = packageName `Set.member` expectedFailures if passed then do