Allow more erroneous warnings for now.

Eventually, configuring will be rewritten so extra constraints do note pollute the checks. When that happens this commit should be reverted.
haskell · Mar 7, 2018 · 3c2e70e · 3c2e70e
1 parent aa5a4fa
commit 3c2e70e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary0/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary0/setup.cabal.out
@@ -1,4 +1,4 @@
 # Setup configure
 Resolving dependencies...
 Configuring InternalLibrary0-0.1...
-cabal: The field 'build-depends: InternalLibrary0' refers to a library which is defined within the same package. To use this feature the package must specify at least 'cabal-version: >= 1.8'.
+cabal: The field 'build-depends: InternalLibrary0 -any' refers to a library which is defined within the same package. To use this feature the package must specify at least 'cabal-version: >= 1.8'.
diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary0/setup.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary0/setup.out
@@ -1,3 +1,3 @@
 # Setup configure
 Configuring InternalLibrary0-0.1...
-setup: The field 'build-depends: InternalLibrary0' refers to a library which is defined within the same package. To use this feature the package must specify at least 'cabal-version: >= 1.8'.
+setup: The field 'build-depends: InternalLibrary0 -any' refers to a library which is defined within the same package. To use this feature the package must specify at least 'cabal-version: >= 1.8'.
diff --git a/cabal-testsuite/PackageTests/ConfigureComponent/SubLib/setup-explicit.out b/cabal-testsuite/PackageTests/ConfigureComponent/SubLib/setup-explicit.out
@@ -9,6 +9,7 @@ Installing internal library sublib in <PATH>
 Registering library 'sublib' for Lib-0.1.0.0..
 # Setup configure
 Configuring executable 'exe' for Lib-0.1.0.0..
+Warning: The package has an extraneous version range for a dependency on an internal library: Lib:sublib -any && ==0.1.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
 # Setup build
 Preprocessing executable 'exe' for Lib-0.1.0.0..
 Building executable 'exe' for Lib-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out
@@ -9,8 +9,10 @@ Configuring library 'q' for p-0.1.0.0..
 Preprocessing library 'q' for p-0.1.0.0..
 Building library 'q' for p-0.1.0.0..
 Configuring library for p-0.1.0.0..
+Warning: The package has an extraneous version range for a dependency on an internal library: p:q -any && ==0.1.0.0, p -any && -any && ==0.1.0.0, p:q -any && -any && ==0.1.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
 Preprocessing library for p-0.1.0.0..
 Building library for p-0.1.0.0..
 Configuring executable 'foo' for p-0.1.0.0..
+Warning: The package has an extraneous version range for a dependency on an internal library: p:q -any && ==0.1.0.0 && ==0.1.0.0, p -any && -any && ==0.1.0.0 && ==0.1.0.0, p:q -any && -any && ==0.1.0.0 && ==0.1.0.0. This version range includes the current package but isn't needed as the current package's library will always be used.
 Preprocessing executable 'foo' for p-0.1.0.0..
 Building executable 'foo' for p-0.1.0.0..
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildDependsBad/setup.cabal.out b/cabal-testsuite/PackageTests/InternalVersions/BuildDependsBad/setup.cabal.out
@@ -1,10 +1,4 @@
 # Setup configure
 Resolving dependencies...
-Warning: solver failed to find a solution:
-Could not resolve dependencies:
-[__0] next goal: build-depends-bad-version (user goal)
-[__0] rejecting: build-depends-bad-version-0.1.0.0 (conflict: build-depends-bad-version==0.1.0.0, build-depends-bad-version => build-depends-bad-version>=2)
-After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: build-depends-bad-version (2)
-Trying configure anyway.
 Configuring build-depends-bad-version-0.1.0.0...
 cabal: The package has an impossible version range for a dependency on an internal library: build-depends-bad-version >=2. This version range does not include the current package, and must be removed as the current package's library will always be used.