Skip to content

Commit 17dbff1

Browse files
committed
Extract ghcide-tests into its own package
Move ghcide-test-utils to a top-level directory. Extrace ghcide-tests into its own package, s.t. it can depend on hls-test-utils for defining tests. In particular, it should use the same infrastructure for ignoring tests.
1 parent 03e3426 commit 17dbff1

File tree

11 files changed

+315
-88
lines changed

11 files changed

+315
-88
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
os: ${{ runner.os }}
107107

108108
- name: Build
109-
run: cabal build
109+
run: cabal build
110110

111111
- name: Set test options
112112
# run the tests without parallelism, otherwise tasty will attempt to run
@@ -130,7 +130,7 @@ jobs:
130130
- if: needs.pre_job.outputs.should_skip_ghcide != 'true' && matrix.test
131131
name: Test ghcide
132132
# run the tests without parallelism to avoid running out of memory
133-
run: cabal test ghcide --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test ghcide --test-options="$TEST_OPTS"
133+
run: cabal test ghcide-tests --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test ghcide-tests --test-options="$TEST_OPTS"
134134

135135
- if: matrix.test
136136
name: Test hls-plugin-api
@@ -148,7 +148,7 @@ jobs:
148148
env:
149149
HLS_TEST_EXE: hls
150150
HLS_WRAPPER_TEST_EXE: hls-wrapper
151-
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
151+
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
152152

153153
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
154154
name: Test hls-brittany-plugin

cabal.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ packages:
55
./hls-graph
66
./ghcide
77
./ghcide-bench
8+
./ghcide/ghcide-test-utils
89
./ghcide/test
910
./hls-plugin-api
1011
./hls-test-utils

flake.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@
157157
hie-compat = ./hie-compat;
158158
hls-plugin-api = ./hls-plugin-api;
159159
hls-test-utils = ./hls-test-utils;
160-
ghcide-test-utils = ./ghcide/test;
160+
ghcide-test-utils = ./ghcide/ghcide-test-utils;
161+
ghcide-tests = ./ghcide/tests;
161162
# hiedb depends on hie-compact, which is part of this repository. If
162163
# cabal inside the nix development shell tries to use the hiedb
163164
# compiled inside nix, it thinks that this package is broken and

ghcide/ghcide-test-utils/LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2019 Digital Asset (Switzerland) GmbH and/or its affiliates
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

ghcide/ghcide.cabal

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -312,87 +312,3 @@ executable ghcide
312312
cpp-options: -DMONITORING_EKG
313313
if impl(ghc >= 9)
314314
ghc-options: -Wunused-packages
315-
316-
317-
test-suite ghcide-tests
318-
type: exitcode-stdio-1.0
319-
default-language: Haskell2010
320-
build-tool-depends:
321-
ghcide:ghcide,
322-
ghcide:ghcide-test-preprocessor,
323-
implicit-hie:gen-hie
324-
build-depends:
325-
aeson,
326-
async,
327-
base,
328-
containers,
329-
data-default,
330-
directory,
331-
extra,
332-
filepath,
333-
fuzzy,
334-
--------------------------------------------------------------
335-
-- The MIN_VERSION_ghc macro relies on MIN_VERSION pragmas
336-
-- which require depending on ghc. So the tests need to depend
337-
-- on ghc if they need to use MIN_VERSION_ghc. Maybe a
338-
-- better solution can be found, but this is a quick solution
339-
-- which works for now.
340-
ghc,
341-
--------------------------------------------------------------
342-
ghcide,
343-
lsp,
344-
lsp-types,
345-
hls-plugin-api,
346-
lens,
347-
list-t,
348-
lsp-test ^>= 0.14,
349-
monoid-subclasses,
350-
network-uri,
351-
QuickCheck,
352-
random,
353-
regex-tdfa ^>= 1.3.1,
354-
shake,
355-
sqlite-simple,
356-
stm,
357-
stm-containers,
358-
tasty,
359-
tasty-expected-failure,
360-
tasty-hunit >= 0.10,
361-
tasty-quickcheck,
362-
tasty-rerun,
363-
text,
364-
text-rope,
365-
unordered-containers,
366-
if impl(ghc < 9.2)
367-
build-depends:
368-
record-dot-preprocessor,
369-
record-hasfield
370-
if impl(ghc < 9.3)
371-
build-depends: ghc-typelits-knownnat
372-
if impl(ghc >= 9)
373-
ghc-options: -Wunused-packages
374-
hs-source-dirs: test/cabal test/exe test/src
375-
ghc-options: -threaded -Wall -Wno-name-shadowing -O0 -Wno-unticked-promoted-constructors
376-
main-is: Main.hs
377-
other-modules:
378-
Development.IDE.Test.Runfiles
379-
FuzzySearch
380-
Progress
381-
HieDbRetry
382-
Development.IDE.Test
383-
Development.IDE.Test.Diagnostic
384-
default-extensions:
385-
BangPatterns
386-
DeriveFunctor
387-
DeriveGeneric
388-
FlexibleContexts
389-
GeneralizedNewtypeDeriving
390-
LambdaCase
391-
NamedFieldPuns
392-
OverloadedStrings
393-
RecordWildCards
394-
ScopedTypeVariables
395-
StandaloneDeriving
396-
TupleSections
397-
TypeApplications
398-
ViewPatterns

0 commit comments

Comments
 (0)