From 1498e599a79ad053c1d90865b6511e2bdab40dc6 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Fri, 22 Nov 2024 10:19:12 -0800
Subject: [PATCH] cabal-validate: Reorder cli-tests

The `cli-tests` are supposed to be ordered so that the quickest ones run
first. This is not the case, at least on my machine!
---
 cabal-validate/src/Main.hs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cabal-validate/src/Main.hs b/cabal-validate/src/Main.hs
index 428a8a7358d..51472ad34a4 100644
--- a/cabal-validate/src/Main.hs
+++ b/cabal-validate/src/Main.hs
@@ -325,15 +325,17 @@ libSuiteExtras opts = forM_ (extraCompilers opts) $ \compiler' ->
 cliTests :: Opts -> IO ()
 cliTests opts = do
   -- These are sorted in asc time used, quicker tests first.
+
+  -- Only single job, otherwise we fail with "Heap exhausted"
   timedCabalBin
     opts
     "cabal-install"
-    "test:long-tests"
-    ( jobsArgs opts
+    "test:mem-use-tests"
+    ( ["--num-threads", "1"]
         ++ tastyArgs opts
     )
 
-  -- This doesn't work in parallel either.
+  -- This test-suite doesn't like concurrency
   timedCabalBin
     opts
     "cabal-install"
@@ -342,16 +344,15 @@ cliTests opts = do
         ++ tastyArgs opts
     )
 
-  -- Only single job, otherwise we fail with "Heap exhausted"
   timedCabalBin
     opts
     "cabal-install"
-    "test:mem-use-tests"
-    ( ["--num-threads", "1"]
+    "test:long-tests"
+    ( jobsArgs opts
         ++ tastyArgs opts
     )
 
-  -- This test-suite doesn't like concurrency
+  -- This doesn't work in parallel either.
   timedCabalBin
     opts
     "cabal-install"