Commit 7b92877c authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Merge pull request #3152 from grayjay/issue-3147

Handle "\r\n" in internal library package tests (fixes #3147)
parents e8023901 320ab134
......@@ -46,6 +46,7 @@ module PackageTests.PackageTester
, assertOutputContains
, assertOutputDoesNotContain
, assertFindInFile
, concatOutput
, getPersistBuildConfig
......
......@@ -238,8 +238,8 @@ nonSharedLibTests config =
r <- runExe' "lemon" []
assertEqual
("executable should have linked with the " ++ expect ++ " library")
("foofoomyLibFunc " ++ expect)
(concat $ lines (resultOutput r))
("foo foo myLibFunc " ++ expect)
(concatOutput (resultOutput r))
tc :: FilePath -> TestM a -> TestTree
tc = testCase config
......
......@@ -14,7 +14,7 @@ build_script:
- Setup configure --user --ghc-option=-Werror --enable-tests
- Setup build
- Setup test unit-tests --show-details=streaming
# - Setup test package-tests --show-details=streaming --test-options=--skip-shared-library-tests
- Setup test package-tests --show-details=streaming --test-options=--skip-shared-library-tests
- Setup install
- cd ..\cabal-install
- ghc --make -threaded -i -i. Setup.hs -Wall -Werror
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment