setupAndCabalTest uses cabal act-as-setup for cabal part

The cabal command interface will drift more and more from ./Setup interface. This is first step: don't assume they are the same. This removes need to "patch" setup commands to work with cabal: the `act-as-setup` SHOULD behave as (simple) ./Setup There were few setupAndCabalTests which weren't `build-type: Simple`. For those I made a separate `cabal.test.hs`. Also added a OutputNormalizer for global tmp directory. `v2-build` sdists `build-type: Custom` packages to get the list of files to watch. I guess it's ok to have that functionality, yet it could be eventually removed, as `v2-sdist` does not invoke `./Setup.hs` script.
haskell · Apr 3, 2020 · ab35536 · ab35536
1 parent 80befc1
commit ab35536
Show file tree

Hide file tree

Showing 117 changed files with 94 additions and 233 deletions.
diff --git a/cabal-testsuite/PackageTests/Ambiguity/setup-package-import.cabal.out b/cabal-testsuite/PackageTests/Ambiguity/setup-package-import.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring p-0.1.0.0...
 # Setup build
 Preprocessing library for p-0.1.0.0..
@@ -9,7 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring q-0.1.0.0...
 # Setup build
 Preprocessing library for q-0.1.0.0..
@@ -19,7 +17,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for q-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring package-import-0.1.0.0...
 # Setup build
 Preprocessing executable 'package-import' for package-import-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Ambiguity/setup-reexport.cabal.out b/cabal-testsuite/PackageTests/Ambiguity/setup-reexport.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring p-0.1.0.0...
 # Setup build
 Preprocessing library for p-0.1.0.0..
@@ -9,7 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring q-0.1.0.0...
 # Setup build
 Preprocessing library for q-0.1.0.0..
@@ -19,7 +17,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for q-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring reexport-0.1.0.0...
 # Setup build
 Preprocessing library for reexport-0.1.0.0..
@@ -29,7 +26,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for reexport-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring reexport-test-0.1.0.0...
 # Setup build
 Preprocessing executable 'reexport-test' for reexport-test-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/AutogenModules/Package/setup.cabal.out b/cabal-testsuite/PackageTests/AutogenModules/Package/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring AutogenModules-0.1...
 cabal: An 'autogen-module' is neither on 'exposed-modules' or 'other-modules'.
 

diff --git a/cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.cabal.out b/cabal-testsuite/PackageTests/AutogenModules/SrcDist/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring AutogenModules-0.1...
 # Setup sdist
 Building source dist for AutogenModules-0.1...
@@ -8,4 +7,3 @@ Preprocessing library for AutogenModules-0.1..
 Source tarball created: setup.cabal.dist/work/dist/AutogenModules-0.1.tar.gz
 # Setup sdist
 List of package sources written to file '<ROOT>/setup.cabal.dist/work/./dist/list-sources.txt'
-List of package sources written to file '<ROOT>/setup.cabal.dist/work/./dist/list-sources.txt'
diff --git a/cabal-testsuite/PackageTests/Backpack/Fail1/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Fail1/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Fail1-0.1.0.0...
 Error:
     The library 'sig' from package 'Fail1-0.1.0.0' does not require:

diff --git a/cabal-testsuite/PackageTests/Backpack/Fail2/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Fail2/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Fail2-0.1.0.0...
 Error:
     Mix-in refers to non-existent package 'non-existent'

diff --git a/cabal-testsuite/PackageTests/Backpack/Fail3/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Fail3/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Fail1-0.1.0.0...
 Error:
     Non-library component has unfilled requirements: UnfilledSig

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes1/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes1/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Includes1-0.1.0.0...
 # Setup build
 Preprocessing library for Includes1-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring mylib-0.1.0.0...
 # Setup build
 Preprocessing library for mylib-0.1.0.0..
@@ -16,7 +15,6 @@ Installing library in <PATH>
 Registering library instantiated with Database = <Database>
 for mylib-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring mysql-0.1.0.0...
 # Setup build
 Preprocessing library for mysql-0.1.0.0..
@@ -30,7 +28,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for mysql-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring postgresql-0.1.0.0...
 # Setup build
 Preprocessing library for postgresql-0.1.0.0..
@@ -44,7 +41,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for postgresql-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring mylib-0.1.0.0...
 # Setup build
 Preprocessing library for mylib-0.1.0.0..
@@ -62,7 +58,6 @@ Installing library in <PATH>
 Registering library instantiated with Database = mysql-0.1.0.0:Database.MySQL
 for mylib-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring mylib-0.1.0.0...
 # Setup build
 Preprocessing library for mylib-0.1.0.0..
@@ -82,7 +77,6 @@ Registering library instantiated with
   Database = postgresql-0.1.0.0:Database.PostgreSQL
 for mylib-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring src-0.1.0.0...
 # Setup build
 Preprocessing library for src-0.1.0.0..
@@ -96,15 +90,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for src-0.1.0.0..
 # Setup configure
-Resolving dependencies...
-Warning: solver failed to find a solution:
-Could not resolve dependencies:
-[__0] trying: exe-0.1.0.0 (user goal)
-[__1] next goal: src (dependency of exe)
-[__1] rejecting: src-<VERSION>/installed-<HASH> (conflict: src => mylib==<VERSION>/installed-<HASH>, src => mylib==<VERSION>/installed-<HASH>)
-[__1] fail (backjumping, conflict set: exe, src)
-After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: exe (2), src (2)
-Trying configure anyway.
 Configuring exe-0.1.0.0...
 # Setup build
 Preprocessing executable 'exe' for exe-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal-fail.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring fail-0.1.0.0...
 Error:
     - Cannot match module names

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-internal.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Includes2-0.1.0.0...
 # Setup build
 Preprocessing library 'postgresql' for Includes2-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-fail.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-fail.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring sigs-0.1.0.0...
 # Setup build
 Preprocessing library for sigs-0.1.0.0..
@@ -11,7 +10,6 @@ Installing library in <PATH>
 Registering library instantiated with Data.Map = <Data.Map>
 for sigs-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring indef-0.1.0.0...
 # Setup build
 Preprocessing library for indef-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring sigs-0.1.0.0...
 # Setup build
 Preprocessing library for sigs-0.1.0.0..
@@ -16,7 +15,6 @@ Installing library in <PATH>
 Registering library instantiated with Data.Map = <Data.Map>
 for sigs-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring indef-0.1.0.0...
 # Setup build
 Preprocessing library for indef-0.1.0.0..
@@ -33,7 +31,6 @@ Installing library in <PATH>
 Registering library instantiated with Data.Map = <Data.Map>
 for indef-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring sigs-0.1.0.0...
 # Setup build
 Preprocessing library for sigs-0.1.0.0..
@@ -51,7 +48,6 @@ Installing library in <PATH>
 Registering library instantiated with Data.Map = containers-<VERSION>:Data.Map
 for sigs-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring indef-0.1.0.0...
 # Setup build
 Preprocessing library for indef-0.1.0.0..
@@ -69,7 +65,6 @@ Installing library in <PATH>
 Registering library instantiated with Data.Map = containers-<VERSION>:Data.Map
 for indef-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring exe-0.1.0.0...
 # Setup build
 Preprocessing executable 'exe' for exe-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-internal.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-internal.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Includes3-0.1.0.0...
 # Setup build
 Preprocessing library 'sigs' for Includes3-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes4/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes4/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Includes4-0.1.0.0...
 # Setup build
 Preprocessing library 'indef' for Includes4-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes5/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes5/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Includes5-0.1.0.0...
 # Setup build
 Preprocessing library 'impl' for Includes5-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Indef2/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Indef2/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring Indef2-0.1.0.0...
 # Setup build
 Preprocessing library 'asig1' for Indef2-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring p-0.1.0.0...
 # Setup build
 Preprocessing library for p-0.1.0.0..
@@ -13,7 +12,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for p-0.1.0.0..
 # Setup configure
-Resolving dependencies...
 Configuring q-0.1.0.0...
 # Setup build
 Preprocessing library for q-0.1.0.0..

diff --git a/cabal-testsuite/PackageTests/Backpack/Reexport2/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Reexport2/setup.cabal.out
@@ -1,4 +1,3 @@
 # Setup configure
-Resolving dependencies...
 Configuring Reexport2-1.0...
 cabal: Duplicate modules in library: Asdf
diff --git a/cabal-testsuite/PackageTests/Backpack/T4447/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/T4447/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring T4447-1.0...
 Error:
     Cannot instantiate requirement 'A' brought into scope by build-depends: T4447:foo-indef

diff --git a/cabal-testsuite/PackageTests/Backpack/T4754/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/T4754/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring p-0.1...
 Warning: Packages using 'cabal-version: >= 1.10' must specify the 'default-language' field for each component (e.g. Haskell98 or Haskell2010). If a component uses different languages in different modules then list the other ones in the 'other-languages' field.
 # Setup build

diff --git a/cabal-testsuite/PackageTests/Backpack/T5634/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/T5634/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring th-backpack-failure-1.0...
 Warning: Packages using 'cabal-version: >= 1.10' must specify the 'default-language' field for each component (e.g. Haskell98 or Haskell2010). If a component uses different languages in different modules then list the other ones in the 'other-languages' field.
 # Setup build

diff --git a/cabal-testsuite/PackageTests/Backpack/TemplateHaskell/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/TemplateHaskell/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring bkpth-1.0...
 # Setup build
 Preprocessing library 'helper' for bkpth-1.0..

diff --git a/cabal-testsuite/PackageTests/BenchmarkExeV10/setup.cabal.out b/cabal-testsuite/PackageTests/BenchmarkExeV10/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring my-0.1...
 # Setup build
 Preprocessing library for my-0.1..

diff --git a/cabal-testsuite/PackageTests/BenchmarkOptions/setup.cabal.out b/cabal-testsuite/PackageTests/BenchmarkOptions/setup.cabal.out
@@ -1,20 +1,15 @@
 # Setup configure
-Resolving dependencies...
 Configuring BenchmarkOptions-0.1...
 # Setup build
 Preprocessing benchmark 'test-BenchmarkOptions' for BenchmarkOptions-0.1..
 Building benchmark 'test-BenchmarkOptions' for BenchmarkOptions-0.1..
 Preprocessing executable 'dummy' for BenchmarkOptions-0.1..
 Building executable 'dummy' for BenchmarkOptions-0.1..
 # Setup bench
-Preprocessing benchmark 'test-BenchmarkOptions' for BenchmarkOptions-0.1..
-Building benchmark 'test-BenchmarkOptions' for BenchmarkOptions-0.1..
 Running 1 benchmarks...
 Benchmark test-BenchmarkOptions: RUNNING...
 Benchmark test-BenchmarkOptions: FINISH
 # Setup bench
-Preprocessing benchmark 'test-BenchmarkOptions' for BenchmarkOptions-0.1..
-Building benchmark 'test-BenchmarkOptions' for BenchmarkOptions-0.1..
 Running 1 benchmarks...
 Benchmark test-BenchmarkOptions: RUNNING...
 Benchmark test-BenchmarkOptions: FINISH
diff --git a/cabal-testsuite/PackageTests/BenchmarkStanza/setup.cabal.out b/cabal-testsuite/PackageTests/BenchmarkStanza/setup.cabal.out
@@ -1,4 +1,3 @@
 # Setup configure
-Resolving dependencies...
 Configuring BenchmarkStanza-0.1...
 Warning: Packages using 'cabal-version: >= 1.10' must specify the 'default-language' field for each component (e.g. Haskell98 or Haskell2010). If a component uses different languages in different modules then list the other ones in the 'other-languages' field.
diff --git a/cabal-testsuite/PackageTests/BuildDeps/DepCycle/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/DepCycle/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring DepCycle-1.0...
 Error:
     Components in the package depend on each other in a cyclic way:

diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary0/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary0/setup.cabal.out
@@ -1,4 +1,3 @@
 # 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'.
diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring InternalLibrary1-0.1...
 # Setup build
 Preprocessing library for InternalLibrary1-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary2/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary2/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring InternalLibrary2-0.1...
 # Setup build
 Preprocessing library for InternalLibrary2-0.1..
@@ -9,7 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for InternalLibrary2-0.1..
 # Setup configure
-Resolving dependencies...
 Configuring InternalLibrary2-0.1...
 # Setup build
 Preprocessing library for InternalLibrary2-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary3/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary3/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring InternalLibrary3-0.2...
 # Setup build
 Preprocessing library for InternalLibrary3-0.2..
@@ -9,7 +8,6 @@ Installing library in <PATH>
 # Setup register
 Registering library for InternalLibrary3-0.2..
 # Setup configure
-Resolving dependencies...
 Configuring InternalLibrary3-0.1...
 # Setup build
 Preprocessing library for InternalLibrary3-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildDeps/SameDepsAllRound/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/SameDepsAllRound/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring SameDepsAllRound-0.1...
 # Setup build
 Preprocessing executable 'pineapple' for SameDepsAllRound-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps1/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps1/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring TargetSpecificDeps1-0.1...
 # Setup build
 Preprocessing executable 'lemon' for TargetSpecificDeps1-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps2/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps2/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring TargetSpecificDeps1-0.1...
 # Setup build
 Preprocessing executable 'lemon' for TargetSpecificDeps1-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps3/setup.cabal.out b/cabal-testsuite/PackageTests/BuildDeps/TargetSpecificDeps3/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring test-0.1...
 # Setup build
 Preprocessing executable 'lemon' for test-0.1..

diff --git a/cabal-testsuite/PackageTests/BuildToolDependsInternalMissing/setup.cabal.out b/cabal-testsuite/PackageTests/BuildToolDependsInternalMissing/setup.cabal.out
@@ -1,4 +1,3 @@
 # Setup configure
-Resolving dependencies...
 Configuring build-tool-depends-missing-0.1.0.0...
 cabal: The package depends on a missing internal executable: 
diff --git a/cabal-testsuite/PackageTests/BuildTools/Foreign/setup.cabal.out b/cabal-testsuite/PackageTests/BuildTools/Foreign/setup.cabal.out
@@ -1,5 +1,4 @@
 # Setup configure
-Resolving dependencies...
 Configuring build-tools-path-foreign-0.1.0.0...
 # Setup build
 Preprocessing library for build-tools-path-foreign-0.1.0.0..