Skip to content

Add test data files to extra-source-files #1605

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

Merged
merged 3 commits into from
Mar 23, 2021
Merged

Add test data files to extra-source-files #1605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48c7b0d
Add test data to extra-source-files
jneira Mar 22, 2021
5145090
Remove eval test files
jneira Mar 22, 2021
dddd531
Merge branch 'master' into add-testdata-sdist
jneira Mar 23, 2021
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
14 changes: 6 additions & 8 deletions ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cabal-version: 2.2
cabal-version: 2.4
build-type: Simple
category: Development
name: ghcide
Expand All @@ -15,13 +15,11 @@ homepage: https://github.com/haskell/haskell-language-server/tree/mast
bug-reports: https://github.com/haskell/haskell-language-server/issues
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
extra-source-files: include/ghc-api-version.h README.md CHANGELOG.md
test/data/hover/*.hs
test/data/multi/cabal.project
test/data/multi/hie.yaml
test/data/multi/a/a.cabal
test/data/multi/a/*.hs
test/data/multi/b/b.cabal
test/data/multi/b/*.hs
test/data/**/*.project
test/data/**/*.cabal
test/data/**/*.yaml
test/data/**/*.hs
test/data/**/*.hs-boot

source-repository head
type: git
Expand Down
15 changes: 14 additions & 1 deletion haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cabal-version: 2.2
cabal-version: 2.4
category: Development
name: haskell-language-server
version: 1.0.0.0
Expand All @@ -19,6 +19,19 @@ extra-source-files:
README.md
ChangeLog.md
include/ghc-api-version.h
test/testdata/**/*.project
test/testdata/**/*.cabal
test/testdata/**/*.yaml
-- this one is not matched by the previous glob
test/testdata/hlint/ignore/.hlint.yaml
test/testdata/**/*.h
test/testdata/**/*.hs
test/testdata/**/*.expected
test/testdata/**/*.error
-- eval plugin test data is used in the test suite
plugins/hls-eval-plugin/test/testdata/*.yaml
plugins/hls-eval-plugin/test/testdata/*.hs
plugins/hls-eval-plugin/test/testdata/*.hs.expected
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is kinda hacky to me... Let's move eval plugin's tests into its own package, like Sandy did in #1425

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree but it deserves its own pr? This one only makes the hack more evident 😃

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@berberman we can wait for such pr and rebase, if it is about to be done, of course

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm working on this. I think we need extract hls-test-utils to a standalone package, with some test framework stuffs re-exported, so that tests extracted from HLS could reuse these code.

Copy link
Member Author

@jneira jneira Mar 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will remove eval test data files and wait for #1606


flag pedantic
description: Enable -Werror
Expand Down
8 changes: 5 additions & 3 deletions plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
cabal-version: 2.2
cabal-version: 2.4
name: hls-brittany-plugin
version: 1.0.0.0
synopsis: Integration with the Brittany code formatter
description: Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
license: Apache-2.0
license-file: LICENSE
author: The Haskell IDE Team
Expand All @@ -11,12 +12,13 @@ category: Development
build-type: Simple
extra-source-files:
LICENSE
test/testdata/**/*.hs

library
exposed-modules: Ide.Plugin.Brittany
hs-source-dirs: src
build-depends: base
, brittany >= 0.13.1.0
build-depends: base >=4.12 && <5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not base ^>= 4.12?

Copy link
Member Author

@jneira jneira Mar 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied it from the main package so I would keep it for consistency, this way we will accept base > 4.12 && < 5, not sure if it is a good thing though.
But I would change it in another pr, if you don't mind.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, the plan sounds good to me

, brittany >= 0.13.1.0
, filepath
, ghc
, ghc-boot-th
Expand Down
6 changes: 5 additions & 1 deletion plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ license-file: LICENSE
build-type: Simple
extra-source-files:
README.md
-- ChangeLog.md
test/golden/*.cabal
test/golden/*.yaml
test/golden/*.hs
test/golden/*.hs.expected


flag pedantic
description: Enable -Werror
Expand Down