From 189bb1d22424cb0a2ae6c7f03f775e76794938a3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 29 May 2014 18:58:40 +0300 Subject: [PATCH] Get rid of temporary testing workarounds haskell/cabal#1810 --- Stackage/Test.hs | 5 +---- jenkins-build.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Stackage/Test.hs b/Stackage/Test.hs index 5437e777..f219922f 100644 --- a/Stackage/Test.hs +++ b/Stackage/Test.hs @@ -116,10 +116,7 @@ runTestSuite settings testdir (packageName, SelectedPackageInfo {..}) = do getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir when spiHasTests $ do getHandle AppendMode $ run "cabal" ["build"] dir - getHandle AppendMode $ runGhcPackagePath "cabal" - [ "test" - , "--show-details=streaming" -- FIXME temporary workaround for https://github.com/haskell/cabal/issues/1810 - ] dir + getHandle AppendMode $ runGhcPackagePath "cabal" ["test"] dir when (buildDocs settings) $ getHandle AppendMode $ run "cabal" ["haddock"] dir return True diff --git a/jenkins-build.sh b/jenkins-build.sh index 4ac1a41f..0ec25986 100755 --- a/jenkins-build.sh +++ b/jenkins-build.sh @@ -7,5 +7,5 @@ cabal install Cabal ./dist/build/stackage/stackage select --no-platform ./dist/build/stackage/stackage check ./dist/build/stackage/stackage build -./dist/build/stackage/stackage test --test-threads 1 +./dist/build/stackage/stackage test ./create-stackage-tarball.sh