diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 7abde38ade72d9e5ad89aec53c488e44035c3a6f..15fb8e74a897ef0e2a7ebe05ff202af3127e81c0 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -32,6 +32,10 @@ extra-source-files: -- Generated with 'misc/gen-extra-source-files.sh' -- Do NOT edit this section manually; instead, run the script. -- BEGIN gen-extra-source-files + tests/PackageTests/AllowNewer/AllowNewer.cabal + tests/PackageTests/AllowNewer/benchmarks/Bench.hs + tests/PackageTests/AllowNewer/src/Foo.hs + tests/PackageTests/AllowNewer/tests/Test.hs tests/PackageTests/BenchmarkExeV10/Foo.hs tests/PackageTests/BenchmarkExeV10/benchmarks/bench-Foo.hs tests/PackageTests/BenchmarkExeV10/my.cabal diff --git a/Cabal/tests/PackageTests/AllowNewer/AllowNewer.cabal b/Cabal/tests/PackageTests/AllowNewer/AllowNewer.cabal new file mode 100644 index 0000000000000000000000000000000000000000..1fd1cc7d5744670754e648f55a62c5a328c2c7e2 --- /dev/null +++ b/Cabal/tests/PackageTests/AllowNewer/AllowNewer.cabal @@ -0,0 +1,25 @@ +name: AllowNewer +version: 0.1.0.0 +license: BSD3 +author: Foo Bar +maintainer: cabal-dev@haskell.org +build-type: Simple +cabal-version: >=1.10 + +library + exposed-modules: Foo + hs-source-dirs: src + build-depends: base < 1 + default-language: Haskell2010 + +test-suite foo-test + type: exitcode-stdio-1.0 + main-is: Test.hs + hs-source-dirs: tests + build-depends: base < 1 + +benchmark foo-bench + type: exitcode-stdio-1.0 + main-is: Bench.hs + hs-source-dirs: benchmarks + build-depends: base < 1 diff --git a/Cabal/tests/PackageTests/AllowNewer/benchmarks/Bench.hs b/Cabal/tests/PackageTests/AllowNewer/benchmarks/Bench.hs new file mode 100644 index 0000000000000000000000000000000000000000..d82a4bd93b7e75a6ff9845150450ae0709b93086 --- /dev/null +++ b/Cabal/tests/PackageTests/AllowNewer/benchmarks/Bench.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = return () diff --git a/Cabal/tests/PackageTests/AllowNewer/src/Foo.hs b/Cabal/tests/PackageTests/AllowNewer/src/Foo.hs new file mode 100644 index 0000000000000000000000000000000000000000..d82a4bd93b7e75a6ff9845150450ae0709b93086 --- /dev/null +++ b/Cabal/tests/PackageTests/AllowNewer/src/Foo.hs @@ -0,0 +1,4 @@ +module Main where + +main :: IO () +main = return () diff --git a/Cabal/tests/PackageTests/AllowNewer/tests/Test.hs b/Cabal/tests/PackageTests/AllowNewer/tests/Test.hs new file mode 100644 index 0000000000000000000000000000000000000000..170ccdb527ca1acd8748e1a80ea6145989bbbefb --- /dev/null +++ b/Cabal/tests/PackageTests/AllowNewer/tests/Test.hs @@ -0,0 +1,4 @@ +!module Main where + +main :: IO () +main = return () diff --git a/Cabal/tests/PackageTests/Tests.hs b/Cabal/tests/PackageTests/Tests.hs index febd5e7b41f2eaf793eda703d0c1b388da64a153..93a00dec0dd34b715f2c2368937b61856a7d250b 100644 --- a/Cabal/tests/PackageTests/Tests.hs +++ b/Cabal/tests/PackageTests/Tests.hs @@ -227,6 +227,8 @@ nonSharedLibTests config = cabal "configure" ["--allow-newer"] shouldFail $ cabal "configure" ["--allow-newer=baz,quux"] cabal "configure" ["--allow-newer=base", "--allow-newer=baz,quux"] + cabal "configure" ["--allow-newer=bar", "--allow-newer=base,baz" + ,"--allow-newer=quux"] shouldFail $ cabal "configure" ["--enable-tests"] cabal "configure" ["--enable-tests", "--allow-newer"] shouldFail $ cabal "configure" ["--enable-benchmarks"]