Skip to content

Fix integration test collector #3812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fisx merged 2 commits into from
Jan 17, 2024
Merged

Fix integration test collector #3812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d9b96
Whitespace.
fisx Jan 17, 2024
b285580
Don't let /integration/Setup.hs collect temp files.
fisx Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion integration/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE ViewPatterns #-}
{-# OPTIONS_GHC -Wall #-}

import Control.Applicative
Expand Down Expand Up @@ -33,7 +34,16 @@ collectTests pkgRoot roots =
findAllTests :: FilePath -> IO [(String, String, String, String)]
findAllTests root = do
paths <- findPaths root
concat <$> traverse (findModuleTests root) paths
concat <$> traverse (findModuleTests root) (filter (not . noise) paths)

-- don't touch emacs auto-save or backup files
noise :: FilePath -> Bool
noise (last . splitDirectories -> fn) = autosave fn || backup fn
where
backup = (== '~') . last
autosave ('.' : '#' : _) = True
autosave ('#' : _) = True -- (if you want to make this pattern more strict: there is also a '#' at the end.)
autosave _ = False

findModuleTests :: FilePath -> FilePath -> IO [(String, String, String, String)]
findModuleTests root path = do
Expand Down Expand Up @@ -94,6 +104,7 @@ collectTestsInModule pkgRoot fn = do
where
extractComment :: Comment -> String
extractComment (Comment _ _ s) = s

testName :: Name (SrcSpanInfo, [Comment]) -> Maybe (String, String, String)
testName name =
let (n', comments) =
Expand All @@ -105,7 +116,9 @@ collectTestsInModule pkgRoot fn = do
let (summary, rest) = collectDescription comments
in pure (n', summary, rest)
else Nothing

absolutePath = pkgRoot </> fn

-- All of the haskell-src-exts supported extensions that we are using.
-- Several that are in the cabal file couldn't be directly copied over,
-- but they aren't causing trouble at the moment.
Expand Down