mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove git-annex test runner segfault workarounds

Browse source 
Those segfaults were caused by setEnv, which should have been fixed by
commits 79017c612e16653d00253f6862b925b287102624 and
ebb76f0486.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2022-05-18 16:45:27 -04:00
parent 1cacfd1b19
commit 233a0b9b71
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Test/Framework.hs
View file

@ -12,7 +12,6 @@ module Test.Framework where
import Test.Tasty import Test.Tasty
import Test.Tasty.Runners import Test.Tasty.Runners
import Test.Tasty.HUnit import Test.Tasty.HUnit
import Test.Tasty.QuickCheck
import Test.Tasty.Options import Test.Tasty.Options
import Test.Tasty.Ingredients.Rerun import Test.Tasty.Ingredients.Rerun
import Test.Tasty.Ingredients.ConsoleReporter import Test.Tasty.Ingredients.ConsoleReporter
@ -765,13 +764,7 @@ parallelTestRunner' numjobs opts mkts
, cwd = Just subdir , cwd = Just subdir
} }
(_, _, _, pid) <- createProcessConcurrent p (_, _, _, pid) <- createProcessConcurrent p
ret <- waitForProcess pid waitForProcess pid
-- Work around this strange issue
-- https://github.com/UnkindPartition/tasty/issues/326
-- when other workaround does not work.
if ret == ExitFailure (-11)
then runone n
else return ret
nvar <- newTVarIO (1, length ts) nvar <- newTVarIO (1, length ts)
exitcodes <- forConcurrently [1..numjobs] $ \_ -> exitcodes <- forConcurrently [1..numjobs] $ \_ ->
worker [] nvar runone worker [] nvar runone
@ -787,16 +780,9 @@ parallelTestRunner' numjobs opts mkts
exitFailure exitFailure
go (Just subenvval) = case readish subenvval of go (Just subenvval) = case readish subenvval of
Nothing -> error ("Bad " ++ subenv) Nothing -> error ("Bad " ++ subenv)
Just (n, crippledfilesystem, adjustedbranchok) -> isolateGitConfig $ do Just (n, crippledfilesystem, adjustedbranchok) -> setTestEnv $ do
let ts = mkts numparts crippledfilesystem adjustedbranchok opts let ts = mkts numparts crippledfilesystem adjustedbranchok opts
let t = topLevelTestGroup let t = topLevelTestGroup [ ts !! (n - 1) ]
-- Work around this strange issue
-- https://github.com/UnkindPartition/tasty/issues/326
[ testGroup "Tasty"
[ testProperty "tasty self-check" True
]
, ts !! (n - 1)
]
case tryIngredients ingredients (tastyOptionSet opts) t of case tryIngredients ingredients (tastyOptionSet opts) t of
Nothing -> error "No tests found!?" Nothing -> error "No tests found!?"
Just act -> ifM act Just act -> ifM act