From d555422d1779434432489efbc19d75011226c3e6 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 2 Apr 2026 00:38:34 +0200
Subject: [PATCH] tests/Cleanup: prevent parallel test execute with tasty >=
 1.5.4

tasty 1.5.4 automatically parallelizes test cases in a testGroup
unless told not to when built with -threaded (see
https://hackage.haskell.org/package/tasty-1.5.4/changelog). This
differs from the old behavior which required +RTS -N.

Since the cleanup test suite uses shared files for all test cases,
it can't be parallelized at the moment.
---
 tests/Cleanup.hs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/Cleanup.hs b/tests/Cleanup.hs
index c44f5c6..944d2c8 100644
--- a/tests/Cleanup.hs
+++ b/tests/Cleanup.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 import Criterion.Main (Benchmark, bench, nfIO)
@@ -15,7 +16,12 @@ import System.Directory (doesFileExist, removeFile)
 import System.Environment (withArgs)
 import System.IO ( Handle, IOMode(ReadWriteMode), SeekMode(AbsoluteSeek)
                  , hClose, hFileSize, hSeek, openFile)
-import Test.Tasty (TestTree, defaultMain, testGroup)
+import Test.Tasty (TestTree, defaultMain)
+#if MIN_VERSION_tasty(1,5,4)
+import Test.Tasty (inOrderTestGroup)
+#else
+import Test.Tasty (TestName, testGroup)
+#endif
 import Test.Tasty.HUnit (testCase)
 import Test.HUnit (assertFailure)
 import qualified Criterion.Main as C
@@ -100,8 +106,14 @@ testSuccess = testCleanup False
 testFailure :: String -> BenchmarkWithFile -> TestTree
 testFailure = testCleanup True
 
+-- before 1.5.4, tasty would not execute tests in parallel without +RTS -N
+#if !MIN_VERSION_tasty(1,5,4)
+inOrderTestGroup :: TestName -> [TestTree] -> TestTree
+inOrderTestGroup = testGroup
+#endif
+
 main :: IO ()
-main = defaultMain $ testGroup "cleanup"
+main = defaultMain $ inOrderTestGroup "cleanup"
     [ testSuccess "perRun Success" perRun
     , testFailure "perRun Failure" perRun
     , testSuccess "perBatch Success" perBatch