Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move tests dir to cabal install #6963

Merged
merged 2 commits into from
Jul 14, 2020
Merged

Move tests dir to cabal install #6963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74ca6b9
Move tests/ dir to cabal-install/fixtures
phadej Jul 14, 2020
4085535
Add .git-blame-ignore-revs
phadej Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Move tests/ dir to cabal-install/fixtures
74ca6b96c859f2cb6c540cc19ebcc17c878390ea
4 changes: 4 additions & 0 deletions cabal-install/cabal-install.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions cabal-install/cabal-install.cabal.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions cabal-install/cabal-install.cabal.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions cabal-install/cabal-install.cabal.zinza
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
0 tests/fixtures/init/exe-only-golden.cabal → ...tests/fixtures/init/exe-only-golden.cabal
View file
Open in desktop
File renamed without changes.
0 tests/fixtures/init/lib-and-exe-golden.cabal → ...ts/fixtures/init/lib-and-exe-golden.cabal
View file
Open in desktop
File renamed without changes.
0 ...xtures/init/lib-exe-and-test-golden.cabal → ...xtures/init/lib-exe-and-test-golden.cabal
View file
Open in desktop
File renamed without changes.
0 ...b-exe-and-test-with-comments-golden.cabal → ...b-exe-and-test-with-comments-golden.cabal
View file
Open in desktop
File renamed without changes.
16 changes: 0 additions & 16 deletions tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/exe-only.cabal
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions tests/UnitTests/Distribution/Client/Init/goldens/generateCabalFile/lib-exe-and-test.cabal
View file
Open in desktop

This file was deleted.