Merge pull request haskell#9526 from cabalism/fix/double-banger-testn…

…ame-9513 Double banger test names
alt-romes · Dec 21, 2023 · 5b44c05 · 5b44c05
2 parents feaa338 + 78c78d1
commit 5b44c05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/...ckageTests/Project/WarnBuilddir/cabal.out → ...ts/Project/WarnBuilddir/cabal.project.out b/...ckageTests/Project/WarnBuilddir/cabal.out → ...ts/Project/WarnBuilddir/cabal.project.out
diff --git a/...eTests/Project/WarnBuilddir/cabal.test.hs → ...roject/WarnBuilddir/cabal.project.test.hs b/...eTests/Project/WarnBuilddir/cabal.test.hs → ...roject/WarnBuilddir/cabal.project.test.hs
diff --git a/cabal-testsuite/src/Test/Cabal/Monad.hs b/cabal-testsuite/src/Test/Cabal/Monad.hs
@@ -232,7 +232,11 @@ runTestM mode m = withSystemTempDirectory "cabal-testsuite" $ \tmp_dir -> do
     args <- execParser (info testArgParser Data.Monoid.mempty)
     let dist_dir = testArgDistDir args
         (script_dir0, script_filename) = splitFileName (testArgScriptPath args)
-        script_base = dropExtensions script_filename
+
+        stripped = stripExtension ".test.hs" script_filename
+               <|> stripExtension ".multitest.hs" script_filename
+        script_base = fromMaybe (dropExtensions script_filename) stripped
+
     -- Canonicalize this so that it is stable across working directory changes
     script_dir <- canonicalizePath script_dir0
     senv <- mkScriptEnv verbosity