From 3640256e80ba1aa1c1e022a231234dee814ace58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Sat, 15 Feb 2025 20:38:39 +0100 Subject: Collect and evaluate global definitions together --- src/Main.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Main.hs') diff --git a/src/Main.hs b/src/Main.hs index 1f15e68..9b0667d 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -151,12 +151,12 @@ main = do ( modules, allModules ) <- parseTestFiles $ map fst files tests <- forM (zip modules $ map snd files) $ \( Module {..}, mbTestName ) -> do - return $ map ( , map (first LocalVarName) moduleDefinitions ) $ case mbTestName of + return $ case mbTestName of Nothing -> moduleTests Just name -> filter ((==name) . testName) moduleTests - let globalDefs = concatMap (map snd . moduleExportedDefinitions) allModules + let globalDefs = evalGlobalDefs $ concatMap (\m -> map (first ( moduleName m, )) $ moduleDefinitions m) allModules - ok <- allM (\( test, defs ) -> runTest out (optTest opts) test (defs ++ globalDefs)) $ + ok <- allM (runTest out (optTest opts) globalDefs) $ concat $ replicate (optRepeat opts) $ concat tests when (not ok) exitFailure -- cgit v1.2.3