Make test from #4481 more thorough by removing --dry-run.

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/pkg/Main.hs

+import Module (message)
+
+main = putStrLn $ "Main.hs: " ++ message

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/pkg/Setup.hs

+import Module (message)
+import Distribution.Simple
+
+main = putStrLn ("Setup.hs: " ++ message) >> defaultMain

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/pkg/pkg.cabal

 name: pkg
 version: 1.0
 build-type: Custom
-cabal-version: >= 1.24
+cabal-version: >= 1.2
 
 custom-setup
-  setup-depends: setup-dep == 2.*
+  setup-depends: base, Cabal, setup-dep == 2.*
 
-library
-  build-depends: setup-dep == 1.*
+executable my-exe
+  main-is: Main.hs
+  build-depends: base, setup-dep == 1.*

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/repo/setup-dep-1.0/Module.hs

+module Module (message) where
+
+message = "setup-dep from repo"

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/repo/setup-dep-1.0/setup-dep.cabal

@@ -4,3 +4,5 @@ build-type: Simple
 cabal-version: >= 1.2
 
 library
+  build-depends: base
+  exposed-modules: Module

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/setup-dep/Module.hs

+module Module (message) where
+
+message = "setup-dep from project"

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/setup-dep/setup-dep.cabal

@@ -4,3 +4,5 @@ build-type: Simple
 cabal-version: >= 1.2
 
 library
+  build-depends: base
+  exposed-modules: Module

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out

@@ -8,10 +8,19 @@ next goal: setup-dep (user goal)
 rejecting: setup-dep-2.0 (conflict: pkg => setup-dep==1.*)
 rejecting: setup-dep-1.0 (constraint from user target requires ==2.0)
 fail (backjumping, conflict set: pkg, setup-dep)
-After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: setup-dep (3), pkg (2)
+After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: pkg (4), setup-dep (3)
 # cabal new-build
 Resolving dependencies...
-In order, the following would be built:
+In order, the following will be built:
  - setup-dep-1.0 (lib:setup-dep) (requires download & build)
- - setup-dep-2.0 (first run)
- - pkg-1.0 (lib:pkg) (first run)
+ - setup-dep-2.0 (lib:setup-dep) (first run)
+ - pkg-1.0 (exe:my-exe) (first run)
+Configuring setup-dep-1.0...
+Preprocessing library for setup-dep-1.0..
+Building library for setup-dep-1.0..
+Installing library in <PATH>
+Configuring setup-dep-2.0...
+Preprocessing library for setup-dep-2.0..
+Building library for setup-dep-2.0..
+# pkg my-exe
+Main.hs: setup-dep from repo

cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.test.hs

@@ -10,6 +10,12 @@ import Test.Cabal.Prelude
 -- qualifier as pkg, even though they are both build targets of the project.
 -- The solution must use --independent-goals to give pkg and setup-dep different
 -- qualifiers.
-main = cabalTest $ withRepo "repo" $ do
-  fails $ cabal "new-build" ["pkg", "--dry-run"]
-  cabal "new-build" ["pkg", "--dry-run", "--independent-goals"]
+main = cabalTest $ do
+  skipUnless =<< hasNewBuildCompatBootCabal
+  withRepo "repo" $ do
+    fails $ cabal "new-build" ["pkg:my-exe", "--dry-run"]
+    r1 <- cabal' "new-build" ["pkg:my-exe", "--independent-goals"]
+    assertOutputContains "Setup.hs: setup-dep from project" r1
+    withPlan $ do
+      r2 <- runPlanExe' "pkg" "my-exe" []
+      assertOutputContains "Main.hs: setup-dep from repo" r2