git.iko.soy/stackage
on master help sign in
Get rid of temporary testing workarounds haskell/cabal#1810
189bb1dMichael Snoyman
Stackage/Test.hs+1−4
compare with master
unifiedsplit
@@ -116,10 +116,7 @@ runTestSuite settings testdir (packageName, SelectedPackageInfo {..}) = do
116 getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir
116 getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir
117 when spiHasTests $ do
117 when spiHasTests $ do
118 getHandle AppendMode $ run "cabal" ["build"] dir
118 getHandle AppendMode $ run "cabal" ["build"] dir
119− getHandle AppendMode $ runGhcPackagePath "cabal"
119+ getHandle AppendMode $ runGhcPackagePath "cabal" ["test"] dir
120− [ "test"
121− , "--show-details=streaming" -- FIXME temporary workaround for https://github.com/haskell/cabal/issues/1810
122− ] dir
123 when (buildDocs settings) $
120 when (buildDocs settings) $
124 getHandle AppendMode $ run "cabal" ["haddock"] dir
121 getHandle AppendMode $ run "cabal" ["haddock"] dir
125 return True
122 return True
jenkins-build.sh+1−1
@@ -7,5 +7,5 @@ cabal install Cabal
7./dist/build/stackage/stackage select --no-platform
7./dist/build/stackage/stackage select --no-platform
8./dist/build/stackage/stackage check
8./dist/build/stackage/stackage check
9./dist/build/stackage/stackage build
9./dist/build/stackage/stackage build
10−./dist/build/stackage/stackage test --test-threads 1
10+./dist/build/stackage/stackage test
11./create-stackage-tarball.sh
11./create-stackage-tarball.sh