From 063b8483cf1cdba1d7e6b342c3949e8062a8d6ec Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Mon, 23 Sep 2024 16:36:49 -0700
Subject: [PATCH] Add tests

---
 .../MissingOrPrivate/Lib.cabal                | 20 +++++++++++++++++++
 .../MissingOrPrivate/Lib.hs                   |  2 ++
 .../MissingOrPrivate/exe/Exe.hs               |  2 ++
 .../MissingOrPrivate/setup-fail.test.hs       |  8 ++++++++
 .../src/Test/Cabal/OutputNormalizer.hs        |  1 +
 5 files changed, 33 insertions(+)
 create mode 100644 cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.cabal
 create mode 100644 cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.hs
 create mode 100644 cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/exe/Exe.hs
 create mode 100644 cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/setup-fail.test.hs

diff --git a/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.cabal b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.cabal
new file mode 100644
index 00000000000..284513bd8b1
--- /dev/null
+++ b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.cabal
@@ -0,0 +1,20 @@
+cabal-version:       3.0
+name:                Lib
+version:             0.1.0.0
+license:             BSD-3-Clause
+author:              Edward Z. Yang
+maintainer:          ezyang@cs.stanford.edu
+build-type:          Simple
+
+library foo-internal
+  build-depends:       base
+  exposed-modules:     Lib
+  default-language:    Haskell2010
+
+executable exe
+  main-is:             Exe.hs
+  build-depends:       base <=1.0,
+                       package-that-does-not-exist,
+                       Lib:{foo-internal, bar-internal},
+  hs-source-dirs:      exe
+  default-language:    Haskell2010
diff --git a/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.hs b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.hs
new file mode 100644
index 00000000000..1d7d07d5cba
--- /dev/null
+++ b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/Lib.hs
@@ -0,0 +1,2 @@
+module Lib where
+lib = "OK"
diff --git a/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/exe/Exe.hs b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/exe/Exe.hs
new file mode 100644
index 00000000000..6ee3fb933aa
--- /dev/null
+++ b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/exe/Exe.hs
@@ -0,0 +1,2 @@
+import Lib
+main = putStrLn lib
diff --git a/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/setup-fail.test.hs b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/setup-fail.test.hs
new file mode 100644
index 00000000000..5d8123ee88c
--- /dev/null
+++ b/cabal-testsuite/PackageTests/ConfigureComponent/MissingOrPrivate/setup-fail.test.hs
@@ -0,0 +1,8 @@
+
+import Test.Cabal.Prelude
+main = setupTest $ do
+    withPackageDb $ do
+        base_id <- getIPID "base"
+        setup_install ["foo-internal", "--cid", "foo-internal-0.1-abc"]
+        r <- fails $ setup' "configure" [ "exe" ]
+        assertOutputContains "Lib" r
diff --git a/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs b/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs
index 33e1522526b..fb2840be9e6 100644
--- a/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs
+++ b/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs
@@ -80,6 +80,7 @@ normalizeOutput nenv =
   . maybe id normalizePathCmdOutput (normalizerCabalInstallVersion nenv)
   -- hackage-security locks occur non-deterministically
   . resub "(Released|Acquired|Waiting) .*hackage-security-lock\n" ""
+  . resub "installed: [0-9]+(\\.[0-9]+)*" "installed: <VERSION>"
   where
     sameDir = "(\\.((\\\\)+|\\/))*"
     packageIdRegex pid =