From 87668771874c06f64be5da329292a564edc27509 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Tue, 17 Dec 2024 08:54:06 -0500 Subject: [PATCH] Use normalizeWindowsOutput --- .../PackageTests/ConditionalAndImport/cabal.test.hs | 3 --- cabal-testsuite/src/Test/Cabal/Prelude.hs | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs index 67118d362c0..704ea45c877 100644 --- a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs +++ b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs @@ -1,8 +1,5 @@ import Test.Cabal.Prelude -normalizeWindowsOutput :: String -> String -normalizeWindowsOutput = if isWindows then map (\x -> case x of '/' -> '\\'; _ -> x) else id - main = cabalTest . withRepo "repo" . recordMode RecordMarked $ do let log = recordHeader . pure diff --git a/cabal-testsuite/src/Test/Cabal/Prelude.hs b/cabal-testsuite/src/Test/Cabal/Prelude.hs index d8cee954d83..8b805ecba0b 100644 --- a/cabal-testsuite/src/Test/Cabal/Prelude.hs +++ b/cabal-testsuite/src/Test/Cabal/Prelude.hs @@ -1093,6 +1093,9 @@ flakyIfCI ticket m = do flakyIfWindows :: IssueID -> TestM a -> TestM a flakyIfWindows ticket m = flakyIf isWindows ticket m +normalizeWindowsOutput :: String -> String +normalizeWindowsOutput = if isWindows then map (\x -> case x of '/' -> '\\'; _ -> x) else id + getOpenFilesLimit :: TestM (Maybe Integer) #ifdef mingw32_HOST_OS -- No MS-specified limit, was determined experimentally on Windows 10 Pro x64,