Merge pull request #6963 from phadej/move-tests-dir-to-cabal-install

Move tests dir to cabal install
haskell · Jul 14, 2020 · 6f22f2a · 6f22f2a
2 parents 26ed693 + 4085535
commit 6f22f2a
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 45 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Move tests/ dir to cabal-install/fixtures
+74ca6b96c859f2cb6c540cc19ebcc17c878390ea
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -92,6 +92,10 @@ Extra-Source-Files:
   tests/IntegrationTests2/targets/tests-disabled/q/q.cabal
   tests/IntegrationTests2/targets/variety/cabal.project
   tests/IntegrationTests2/targets/variety/p.cabal
+  tests/fixtures/init/exe-only-golden.cabal
+  tests/fixtures/init/lib-and-exe-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal
   -- END gen-extra-source-files
 
   -- Additional manual extra-source-files:

diff --git a/cabal-install/cabal-install.cabal.dev b/cabal-install/cabal-install.cabal.dev
@@ -92,6 +92,10 @@ Extra-Source-Files:
   tests/IntegrationTests2/targets/tests-disabled/q/q.cabal
   tests/IntegrationTests2/targets/variety/cabal.project
   tests/IntegrationTests2/targets/variety/p.cabal
+  tests/fixtures/init/exe-only-golden.cabal
+  tests/fixtures/init/lib-and-exe-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal
   -- END gen-extra-source-files
 
   -- Additional manual extra-source-files:

diff --git a/cabal-install/cabal-install.cabal.prod b/cabal-install/cabal-install.cabal.prod
@@ -92,6 +92,10 @@ Extra-Source-Files:
   tests/IntegrationTests2/targets/tests-disabled/q/q.cabal
   tests/IntegrationTests2/targets/variety/cabal.project
   tests/IntegrationTests2/targets/variety/p.cabal
+  tests/fixtures/init/exe-only-golden.cabal
+  tests/fixtures/init/lib-and-exe-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal
   -- END gen-extra-source-files
 
   -- Additional manual extra-source-files:

diff --git a/cabal-install/cabal-install.cabal.zinza b/cabal-install/cabal-install.cabal.zinza
@@ -373,6 +373,10 @@ Extra-Source-Files:
   tests/IntegrationTests2/targets/tests-disabled/q/q.cabal
   tests/IntegrationTests2/targets/variety/cabal.project
   tests/IntegrationTests2/targets/variety/p.cabal
+  tests/fixtures/init/exe-only-golden.cabal
+  tests/fixtures/init/lib-and-exe-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-golden.cabal
+  tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal
   -- END gen-extra-source-files
 
   -- Additional manual extra-source-files:

diff --git a/tests/fixtures/init/exe-only-golden.cabal → ...tests/fixtures/init/exe-only-golden.cabal b/tests/fixtures/init/exe-only-golden.cabal → ...tests/fixtures/init/exe-only-golden.cabal
diff --git a/tests/fixtures/init/lib-and-exe-golden.cabal → ...ts/fixtures/init/lib-and-exe-golden.cabal b/tests/fixtures/init/lib-and-exe-golden.cabal → ...ts/fixtures/init/lib-and-exe-golden.cabal
diff --git a/...xtures/init/lib-exe-and-test-golden.cabal → ...xtures/init/lib-exe-and-test-golden.cabal b/...xtures/init/lib-exe-and-test-golden.cabal → ...xtures/init/lib-exe-and-test-golden.cabal
diff --git a/...b-exe-and-test-with-comments-golden.cabal → ...b-exe-and-test-with-comments-golden.cabal b/...b-exe-and-test-with-comments-golden.cabal → ...b-exe-and-test-with-comments-golden.cabal
diff --git a/tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/exe-only.cabal b/tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/exe-only.cabal
diff --git a/tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/lib-exe-and-test.cabal b/tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/lib-exe-and-test.cabal