haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-23 19:47:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build docs before tests #315

Browse Source
This commit is contained in:
Michael Snoyman 2014-10-23 05:54:29 +03:00
parent bc33d74377
commit cdd0a645fc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Stackage/Test.hs
View File

@ -134,14 +134,8 @@ runTestSuite cabalVersion settings testdir docdir bp (packageName, SelectedPacka
createDirectoryIfMissing True cfd createDirectoryIfMissing True cfd
copyFile src dst copyFile src dst
getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir
when spiHasTests $ do
getHandle AppendMode $ run "cabal" ["build"] dir -- Try building docs first in case tests have an expected failure.
getHandle AppendMode $ run "cabal" (concat
[ ["test"]
, if cabalVersion >= CabalVersion 1 20
then ["--show-details=streaming"] -- FIXME temporary workaround for https://github.com/haskell/cabal/issues/1810
else []
]) dir
when (buildDocs settings) $ do when (buildDocs settings) $ do
getHandle AppendMode $ run "cabal" getHandle AppendMode $ run "cabal"
[ "haddock" [ "haddock"
@ -154,6 +148,15 @@ runTestSuite cabalVersion settings testdir docdir bp (packageName, SelectedPacka
handle (\(_ :: IOException) -> return ()) $ renameDirectory handle (\(_ :: IOException) -> return ()) $ renameDirectory
(dir </> "dist" </> "doc" </> "html" </> packageName') (dir </> "dist" </> "doc" </> "html" </> packageName')
(docdir </> package) (docdir </> package)
when spiHasTests $ do
getHandle AppendMode $ run "cabal" ["build"] dir
getHandle AppendMode $ run "cabal" (concat
[ ["test"]
, if cabalVersion >= CabalVersion 1 20
then ["--show-details=streaming"] -- FIXME temporary workaround for https://github.com/haskell/cabal/issues/1810
else []
]) dir
return True return True
let expectedFailure = packageName `Set.member` bpExpectedFailures bp let expectedFailure = packageName `Set.member` bpExpectedFailures bp
if passed if passed