Skip to content

Commit 3f9ce03

Browse files
authored
Merge pull request haskell#10589 from 9999years/validate-reorder-cli-tests
cabal-validate: Reorder cli-tests
2 parents 767c8b0 + 1498e59 commit 3f9ce03

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

cabal-validate/src/Main.hs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,15 +325,17 @@ libSuiteExtras opts = forM_ (extraCompilers opts) $ \compiler' ->
325325
cliTests :: Opts -> IO ()
326326
cliTests opts = do
327327
-- These are sorted in asc time used, quicker tests first.
328+
329+
-- Only single job, otherwise we fail with "Heap exhausted"
328330
timedCabalBin
329331
opts
330332
"cabal-install"
331-
"test:long-tests"
332-
( jobsArgs opts
333+
"test:mem-use-tests"
334+
( ["--num-threads", "1"]
333335
++ tastyArgs opts
334336
)
335337

336-
-- This doesn't work in parallel either.
338+
-- This test-suite doesn't like concurrency
337339
timedCabalBin
338340
opts
339341
"cabal-install"
@@ -342,16 +344,15 @@ cliTests opts = do
342344
++ tastyArgs opts
343345
)
344346

345-
-- Only single job, otherwise we fail with "Heap exhausted"
346347
timedCabalBin
347348
opts
348349
"cabal-install"
349-
"test:mem-use-tests"
350-
( ["--num-threads", "1"]
350+
"test:long-tests"
351+
( jobsArgs opts
351352
++ tastyArgs opts
352353
)
353354

354-
-- This test-suite doesn't like concurrency
355+
-- This doesn't work in parallel either.
355356
timedCabalBin
356357
opts
357358
"cabal-install"

0 commit comments

Comments
 (0)