Handle "\r\n" in internal library package tests (fixes #3147)

Cabal/tests/PackageTests/PackageTester.hs

@@ -46,6 +46,7 @@ module PackageTests.PackageTester
     , assertOutputContains
     , assertOutputDoesNotContain
     , assertFindInFile
+    , concatOutput
 
     , getPersistBuildConfig
 

Cabal/tests/PackageTests/Tests.hs

@@ -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