Renamed test packages

test/integration/tests/717-sdist-test/Main.hs

@@ -7,13 +7,13 @@ main = do
   -- keep old behavior
   stack ["sdist"]
   -- successful sdist with --test-tarball
-  stack ["sdist", "packageb", "--test-tarball"]
+  stack ["sdist", "package-with-working-th", "--test-tarball"]
   -- fails because package contains TH which depends on files which are not put into sdist tarball
-  stackErr ["sdist", "packagea", "--test-tarball"]
+  stackErr ["sdist", "package-with-th", "--test-tarball"]
   -- same, but inside a subdir
-  stackErr ["sdist", "packagecd/packagec", "--test-tarball"]
+  stackErr ["sdist", "subdirs/failing-in-subdir", "--test-tarball"]
   -- depends on packagea and packagec - these would fail if they were the target of sdist,
   -- but since they are just dependencies, the operation should succeed
-  stack ["sdist", "packagecd/packaged", "--test-tarball"]
+  stack ["sdist", "subdirs/dependent-on-failing-packages", "--test-tarball"]
   -- fails because a test depends on files which are not put into sdist tarball
-  stackErr ["sdist", "packagee", "--test-tarball"]
+  stackErr ["sdist", "package-with-failing-test", "--test-tarball"]

test/integration/tests/717-sdist-test/files/packagee/packagee.cabal → test/integration/tests/717-sdist-test/files/package-with-failing-test/package-with-failing-test.cabal

@@ -1,4 +1,4 @@
-name:                packagee
+name:                package-with-failing-test
 version:             0.1.0.0
 synopsis:            Some package
 description:         Some package

test/integration/tests/717-sdist-test/files/packagea/packagea.cabal → test/integration/tests/717-sdist-test/files/package-with-th/package-with-th.cabal

@@ -1,4 +1,4 @@
-name:                packagea
+name:                package-with-th
 version:             0.1.0.0
 synopsis:            Some package
 description:         Some package

test/integration/tests/717-sdist-test/files/packageb/packageb.cabal → test/integration/tests/717-sdist-test/files/package-with-working-th/package-with-working-th.cabal

@@ -1,4 +1,4 @@
-name:                packageb
+name:                package-with-working-th
 version:             0.1.0.0
 synopsis:            Some package
 description:         Some package

test/integration/tests/717-sdist-test/files/stack.yaml

@@ -1,12 +1,12 @@
 resolver: lts-8.15
 packages:
-- packagea
-- packageb
-- packagee
-- location: packagecd
+- package-with-th
+- package-with-working-th
+- package-with-failing-test
+- location: subdirs
   subdirs:
-  - packagec
-  - packaged
+  - dependent-on-failing-packages
+  - failing-in-subdir
 extra-deps: []
 flags: {}
 extra-package-dbs: []

test/integration/tests/717-sdist-test/files/packagecd/packaged/packaged.cabal → test/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/dependent-on-failing-packages.cabal

@@ -1,4 +1,4 @@
-name:                packaged
+name:                dependent-on-failing-packages
 version:             0.1.0.0
 synopsis:            Some package
 description:         Some package
@@ -18,6 +18,6 @@ library
   exposed-modules:     LibD
   build-depends:       base >= 4.7 && < 5,
                        template-haskell,
-                       packagea,
-                       packagec
+                       package-with-th,
+                       failing-in-subdir
   default-language:    Haskell2010

test/integration/tests/717-sdist-test/files/packagecd/packagec/packagec.cabal → test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/failing-in-subdir.cabal

@@ -1,4 +1,4 @@
-name:                packagec
+name:                failing-in-subdir
 version:             0.1.0.0
 synopsis:            Some package
 description:         Some package
@@ -16,7 +16,7 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:     LibC,
-                       THC
+                       THInSubdir
   build-depends:       base >= 4.7 && < 5,
                        template-haskell
   default-language:    Haskell2010

test/integration/tests/717-sdist-test/files/packagecd/packagec/src/LibC.hs → test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/LibC.hs

@@ -3,7 +3,7 @@ module LibC
     ( someFuncC
     ) where
 
-import THC
+import THInSubdir
 import Language.Haskell.TH
 
 someFuncC :: IO ()

test/integration/tests/717-sdist-test/files/packagecd/packagec/src/THC.hs → test/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/src/THInSubdir.hs

@@ -1,4 +1,4 @@
-module THC (thFuncC) where
+module THInSubdir (thFuncC) where
 
 import Language.Haskell.TH