From a9609ee070786ef4db2a8209b5c413d3c8965721 Mon Sep 17 00:00:00 2001 From: quasicomputational <quasicomputational@gmail.com> Date: Thu, 21 Jun 2018 10:15:12 +0100 Subject: [PATCH] Make sure that all failure paths in new-sdist are tested This one wasn't actually testing what it said it was testing. Oops. --- .../PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out | 2 +- .../NewSdist/MultiTarget/valid-and-test-suite.test.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out index 803adf5973..35860753c7 100644 --- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out +++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out @@ -1,2 +1,2 @@ # cabal new-sdist -cabal: The package a-test cannot be packaged for distribution, because it is not local to this project. +cabal: The component test suite 'a-tests' cannot be packaged for distribution on its own. Only entire packages may be packaged for distribution. diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.test.hs b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.test.hs index e4d259d783..b500b3fd63 100644 --- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.test.hs +++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.test.hs @@ -1,6 +1,6 @@ import Test.Cabal.Prelude main = cabalTest $ withSourceCopy $ do cwd <- fmap testCurrentDir getTestEnv - fails $ cabal "new-sdist" ["a", "b", "a-test"] + fails $ cabal "new-sdist" ["a", "b", "a-tests"] shouldNotExist $ cwd </> "dist-newstyle/sdist/a-0.1.tar.gz" shouldNotExist $ cwd </> "dist-newstyle/sdist/b-0.1.tar.gz" -- GitLab