Merge pull request #5121 from psftw/haskell-tests

Add haskell-stack test, update haskell-cabal test.

test/config.sh

@@ -88,6 +88,7 @@ imageTests+=(
 	'
 	[haskell]='
 		haskell-cabal
+		haskell-stack
 		haskell-ghci
 		haskell-runhaskell
 	'

test/tests/haskell-cabal/container.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
 set -e
 
-cabal update
+cabal new-update
+cabal new-install --lib hashable

test/tests/haskell-stack/container.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# stack mostly sends to stderr
+stack new myproject 2> /dev/null
+cd myproject
+stack config set resolver ghc-$(ghc --print-project-version) 2> /dev/null
+stack build 2> /dev/null

test/tests/haskell-stack/run.sh

@@ -0,0 +1 @@
+../run-bash-in-container.sh