diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-benches.out b/cabal-testsuite/PackageTests/Target/cabal.all-benches.out index e2926fcf115..621261f013b 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.all-benches.out +++ b/cabal-testsuite/PackageTests/Target/cabal.all-benches.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out b/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out index 12f685ce5ba..fae48570673 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out +++ b/cabal-testsuite/PackageTests/Target/cabal.all-enable-benches.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out b/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out index 9bf8f9ec199..ed8c530e14a 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out +++ b/cabal-testsuite/PackageTests/Target/cabal.all-enable-tests.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-exes.out b/cabal-testsuite/PackageTests/Target/cabal.all-exes.out index fea2396d5ee..6c4eb45c1da 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.all-exes.out +++ b/cabal-testsuite/PackageTests/Target/cabal.all-exes.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.all-tests.out b/cabal-testsuite/PackageTests/Target/cabal.all-tests.out index 6d6faa5d17f..1ffbaeefca2 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.all-tests.out +++ b/cabal-testsuite/PackageTests/Target/cabal.all-tests.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out index 961be723106..77b7ae1940b 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out +++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-bench.out @@ -1,21 +1,16 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project Resolving dependencies... Fully qualified target forms: - a:bench:a-bench -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:bench:a-bench -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:bench:a-bench diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out index 7bacc434e1a..db06ee2ea2a 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out +++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-exe.out @@ -1,21 +1,16 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project Resolving dependencies... Fully qualified target forms: - a:exe:a-exe -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:exe:a-exe -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:exe:a-exe diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out index ad4b0d79ce1..ce44bff40f3 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out +++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-lib.out @@ -1,21 +1,16 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project Resolving dependencies... Fully qualified target forms: - a:lib:a -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:lib:a -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:lib:a diff --git a/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out b/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out index 9038eeb4995..82ed0b891c8 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out +++ b/cabal-testsuite/PackageTests/Target/cabal.component-target-test.out @@ -1,21 +1,16 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project Resolving dependencies... Fully qualified target forms: - a:test:a-test -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:test:a-test -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:test:a-test diff --git a/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out b/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out index f81d3d20480..ba56efa6e60 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out +++ b/cabal-testsuite/PackageTests/Target/cabal.ctype-target.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project @@ -6,24 +5,18 @@ Resolving dependencies... Fully qualified target forms: - a:lib:a - a:lib:a-sublib -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:exe:a-exe -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:test:a-test -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Fully qualified target forms: - a:bench:a-bench diff --git a/cabal-testsuite/PackageTests/Target/cabal.default-all.out b/cabal-testsuite/PackageTests/Target/cabal.default-all.out index 0465b906156..4b058b57f2a 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.default-all.out +++ b/cabal-testsuite/PackageTests/Target/cabal.default-all.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.everything.out b/cabal-testsuite/PackageTests/Target/cabal.everything.out index 10c1ae4c312..49b2dea466e 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.everything.out +++ b/cabal-testsuite/PackageTests/Target/cabal.everything.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out b/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out index 0465b906156..4b058b57f2a 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out +++ b/cabal-testsuite/PackageTests/Target/cabal.explicit-all.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.missing-target.out b/cabal-testsuite/PackageTests/Target/cabal.missing-target.out index a9475f042f1..973cc5d97f1 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.missing-target.out +++ b/cabal-testsuite/PackageTests/Target/cabal.missing-target.out @@ -1,21 +1,16 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project Resolving dependencies... Error: [Cabal-7127] Cannot target the executables in the package c-0.1 because it does not contain any executables. Check the .cabal file for the package and make sure that it properly declares the components that you expect. -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Error: [Cabal-7127] Cannot target the test suites in the package c-0.1 because it does not contain any test suites. Check the .cabal file for the package and make sure that it properly declares the components that you expect. -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project -Resolving dependencies... Error: [Cabal-7127] Cannot target the benchmarks in the package c-0.1 because it does not contain any benchmarks. Check the .cabal file for the package and make sure that it properly declares the components that you expect. diff --git a/cabal-testsuite/PackageTests/Target/cabal.package-target.out b/cabal-testsuite/PackageTests/Target/cabal.package-target.out index a1ca57e51b7..2a621cd91f7 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.package-target.out +++ b/cabal-testsuite/PackageTests/Target/cabal.package-target.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project @@ -7,7 +6,6 @@ Fully qualified target forms: - a:exe:a-exe - a:lib:a - a:lib:a-sublib -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.path-target.out b/cabal-testsuite/PackageTests/Target/cabal.path-target.out index a1ca57e51b7..2a621cd91f7 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.path-target.out +++ b/cabal-testsuite/PackageTests/Target/cabal.path-target.out @@ -1,4 +1,3 @@ -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project @@ -7,7 +6,6 @@ Fully qualified target forms: - a:exe:a-exe - a:lib:a - a:lib:a-sublib -# cabal clean # cabal v2-target Configuration is affected by the following files: - cabal.project diff --git a/cabal-testsuite/PackageTests/Target/cabal.test.hs b/cabal-testsuite/PackageTests/Target/cabal.test.hs index f4d4a1c9f59..4307b5ecfb6 100644 --- a/cabal-testsuite/PackageTests/Target/cabal.test.hs +++ b/cabal-testsuite/PackageTests/Target/cabal.test.hs @@ -2,95 +2,64 @@ import Test.Cabal.Prelude main = do cabalTest' "default-all" $ do - cabal "clean" [] cabal "v2-target" [] cabalTest' "explicit-all" $ do - cabal "clean" [] cabal "v2-target" ["all"] cabalTest' "all-enable-tests" $ do - cabal "clean" [] cabal "v2-target" ["all", "--enable-tests"] cabalTest' "all-enable-benches" $ do - cabal "clean" [] cabal "v2-target" ["all", "--enable-benchmarks"] cabalTest' "everything" $ do - cabal "clean" [] cabal "v2-target" ["all", "--enable-tests", "--enable-benchmarks"] cabalTest' "all-exes" $ do - cabal "clean" [] cabal "v2-target" ["all:exes"] cabalTest' "all-tests" $ do - cabal "clean" [] cabal "v2-target" ["all:tests"] cabalTest' "all-benches" $ do - cabal "clean" [] cabal "v2-target" ["all:benches"] cabalTest' "package-target" $ do - cabal "clean" [] cabal "v2-target" ["a"] - cabal "clean" [] cabal "v2-target" ["a", "--enable-tests", "--enable-benchmarks"] cabalTest' "path-target" $ do - cabal "clean" [] cabal "v2-target" ["dir-a/"] - cabal "clean" [] cabal "v2-target" ["dir-a/", "--enable-tests", "--enable-benchmarks"] cabalTest' "component-target-lib" $ do - cabal "clean" [] cabal "v2-target" ["a:lib:a"] - cabal "clean" [] cabal "v2-target" ["lib:a"] - cabal "clean" [] cabal "v2-target" ["a:a"] cabalTest' "component-target-exe" $ do - cabal "clean" [] cabal "v2-target" ["a:exe:a-exe"] - cabal "clean" [] cabal "v2-target" ["exe:a-exe"] - cabal "clean" [] cabal "v2-target" ["a:a-exe"] cabalTest' "component-target-bench" $ do - cabal "clean" [] cabal "v2-target" ["a:bench:a-bench"] - cabal "clean" [] cabal "v2-target" ["bench:a-bench"] - cabal "clean" [] cabal "v2-target" ["a:a-bench"] cabalTest' "component-target-test" $ do - cabal "clean" [] cabal "v2-target" ["a:test:a-test"] - cabal "clean" [] cabal "v2-target" ["test:a-test"] - cabal "clean" [] cabal "v2-target" ["a:a-test"] cabalTest' "ctype-target" $ do - cabal "clean" [] cabal "v2-target" ["a:libs"] - cabal "clean" [] cabal "v2-target" ["a:exes"] - cabal "clean" [] cabal "v2-target" ["a:tests"] - cabal "clean" [] cabal "v2-target" ["a:benches"] cabalTest' "missing-target" $ do - cabal "clean" [] fails $ cabal "v2-target" ["c:exes"] - cabal "clean" [] fails $ cabal "v2-target" ["c:tests"] - cabal "clean" [] fails $ cabal "v2-target" ["c:benches"]