From 74ca6b96c859f2cb6c540cc19ebcc17c878390ea Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 14 Jul 2020 14:49:20 +0300 Subject: [PATCH 1/2] Move tests/ dir to cabal-install/fixtures --- cabal-install/cabal-install.cabal | 4 +++ cabal-install/cabal-install.cabal.dev | 4 +++ cabal-install/cabal-install.cabal.prod | 4 +++ cabal-install/cabal-install.cabal.zinza | 4 +++ .../fixtures/init/exe-only-golden.cabal | 0 .../fixtures/init/lib-and-exe-golden.cabal | 0 .../init/lib-exe-and-test-golden.cabal | 0 ...ib-exe-and-test-with-comments-golden.cabal | 0 .../goldens/generateCabalFile/exe-only.cabal | 16 ---------- .../generateCabalFile/lib-exe-and-test.cabal | 29 ------------------- 10 files changed, 16 insertions(+), 45 deletions(-) rename {tests => cabal-install/tests}/fixtures/init/exe-only-golden.cabal (100%) rename {tests => cabal-install/tests}/fixtures/init/lib-and-exe-golden.cabal (100%) rename {tests => cabal-install/tests}/fixtures/init/lib-exe-and-test-golden.cabal (100%) rename {tests => cabal-install/tests}/fixtures/init/lib-exe-and-test-with-comments-golden.cabal (100%) delete mode 100644 tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/exe-only.cabal delete mode 100644 tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/lib-exe-and-test.cabal diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 24c6e87e388..55b920565aa 100644 --- 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 index 335cd182b1a..e38497c7ae2 100644 --- 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 index 24c6e87e388..55b920565aa 100644 --- 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 index 69067beb535..da852b00045 100644 --- 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 b/cabal-install/tests/fixtures/init/exe-only-golden.cabal similarity index 100% rename from tests/fixtures/init/exe-only-golden.cabal rename to cabal-install/tests/fixtures/init/exe-only-golden.cabal diff --git a/tests/fixtures/init/lib-and-exe-golden.cabal b/cabal-install/tests/fixtures/init/lib-and-exe-golden.cabal similarity index 100% rename from tests/fixtures/init/lib-and-exe-golden.cabal rename to cabal-install/tests/fixtures/init/lib-and-exe-golden.cabal diff --git a/tests/fixtures/init/lib-exe-and-test-golden.cabal b/cabal-install/tests/fixtures/init/lib-exe-and-test-golden.cabal similarity index 100% rename from tests/fixtures/init/lib-exe-and-test-golden.cabal rename to cabal-install/tests/fixtures/init/lib-exe-and-test-golden.cabal diff --git a/tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal b/cabal-install/tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal similarity index 100% rename from tests/fixtures/init/lib-exe-and-test-with-comments-golden.cabal rename to cabal-install/tests/fixtures/init/lib-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 deleted file mode 100644 index b37f018a696..00000000000 --- a/tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/exe-only.cabal +++ /dev/null @@ -1,16 +0,0 @@ -cabal-version: 2.4 -name: foo -version: 3.2.1 -synopsis: The foo package -homepage: https://github.com/foo/foo -license: NONE -author: me -maintainer: me@me.me -category: SomeCat -extra-source-files: CHANGELOG.md - -executable foo - main-is: Main.hs - build-depends: base ^>=4.13.0.0, containers ^>=5.7.0.0, unordered-containers ^>=2.7.0.0 - hs-source-dirs: app - default-language: Haskell2010 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 deleted file mode 100644 index 704c4eed0d9..00000000000 --- a/tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/lib-exe-and-test.cabal +++ /dev/null @@ -1,29 +0,0 @@ -cabal-version: 2.4 -name: foo -version: 3.2.1 -synopsis: The foo package -homepage: https://github.com/foo/foo -license: NONE -author: me -maintainer: me@me.me -category: SomeCat -extra-source-files: CHANGELOG.md - -library - exposed-modules: A, B - build-depends: base ^>=4.13.0.0, containers ^>=5.7.0.0, unordered-containers ^>=2.7.0.0 - hs-source-dirs: src - default-language: Haskell2010 - -executable foo - main-is: Main.hs - build-depends: base ^>=4.13.0.0, containers ^>=5.7.0.0, unordered-containers ^>=2.7.0.0 - hs-source-dirs: app - default-language: Haskell2010 - -test-suite foo-test - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: tests - main-is: MyLibTest.hs - build-depends: base ^>=4.13.0.0, containers ^>=5.7.0.0, unordered-containers ^>=2.7.0.0 From 4085535e5d34a6dd2f3be987bd535682a6777fed Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Tue, 14 Jul 2020 15:38:21 +0300 Subject: [PATCH 2/2] Add .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000000..4e16d45cf64 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Move tests/ dir to cabal-install/fixtures +74ca6b96c859f2cb6c540cc19ebcc17c878390ea