diff --git a/cabal-testsuite/PackageTests/Backpack/Includes1/setup.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes1/setup.test.hs index 882ad5f29475a44e1c4de3ece243bdacc7e046f3..821397afd6741289c89fb3a8fec52ec1964158bf 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes1/setup.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes1/setup.test.hs @@ -5,4 +5,4 @@ main = setupAndCabalTest $ do r <- fails $ setup' "build" [] assertRegex "error should be in B.hs" "^B.hs:" r assertRegex "error should be \"Could not find module Data.Set\"" - "(Could not find module|Failed to load interface).*Data.Set" r + "(Could not (load|find) module|Failed to load interface).*Data.Set" r diff --git a/cabal-testsuite/PackageTests/Backpack/Includes5/setup.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes5/setup.test.hs index adda8fb9f5b13d170394052e705f135b6d6f8f86..ca49edf3fe39b465af1d5b68ebbc24145192916a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes5/setup.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes5/setup.test.hs @@ -4,5 +4,8 @@ main = setupAndCabalTest $ do setup "configure" [] r <- fails $ setup' "build" [] assertOutputContains "Foobar" r - assertOutputContains "Could not find" r + assertRegex + "error should be about not being able to find a module" + "Could not (find|load) module" + r return () diff --git a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps1/setup.test.hs b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps1/setup.test.hs index 16081d95b0cb7d411d933974a5e979372762b130..790afd6aa2b0d5a758bb6f9981639c4bfe03b516 100644 --- a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps1/setup.test.hs +++ b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps1/setup.test.hs @@ -8,4 +8,4 @@ main = setupAndCabalTest $ do assertRegex "error should be in MyLibrary.hs" "^MyLibrary.hs:" r assertRegex "error should be \"Could not find module `Text\\.PrettyPrint\"" - "(Could not find module|Failed to load interface for).*Text\\.PrettyPrint" r + "(Could not (load|find) module|Failed to load interface for).*Text\\.PrettyPrint" r diff --git a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps3/setup.test.hs b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps3/setup.test.hs index 9783b3ea71eff29e8fa5f670e0ebd56288faafa3..7132bb9c9e8c50c9f186e5282d563f978e3b92ab 100644 --- a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps3/setup.test.hs +++ b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps3/setup.test.hs @@ -8,4 +8,4 @@ main = setupAndCabalTest $ do assertRegex "error should be in lemon.hs" "^lemon.hs:" r assertRegex "error should be \"Could not find module `Text\\.PrettyPrint\"" - "(Could not find module|Failed to load interface for).*Text\\.PrettyPrint" r + "(Could not (load|find) module|Failed to load interface for).*Text\\.PrettyPrint" r