Skip to content

Commit 2f7d9e7

Browse files
committed
Move unique duplicates to own test
- Use legacy parser for path duplicates test - Add foo.cabal package so that packages exist - Satisfy fix-whitespace - Use local version of lts-21.25 - Remove repo
1 parent bdc09aa commit 2f7d9e7

36 files changed

+3363
-471
lines changed

cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out

Lines changed: 0 additions & 418 deletions
Large diffs are not rendered by default.

cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -133,41 +133,6 @@ main = cabalTest . withRepo "repo" . recordMode RecordMarked $ do
133133
readFileVerbatim "oops.expect.txt"
134134
>>= flip (assertOn isInfixOf multilineNeedleHaystack) oopsing . normalizePathSeparators
135135

136-
-- The project is named yops as it is like hops but with y's for forks.
137-
-- +-- yops-0.project
138-
-- +-- yops/yops-1.config
139-
-- +-- yops-2.config
140-
-- +-- yops/yops-3.config
141-
-- +-- yops-4.config
142-
-- +-- yops/yops-5.config
143-
-- +-- yops-6.config
144-
-- +-- yops/yops-7.config
145-
-- +-- yops-8.config
146-
-- +-- yops/yops-9.config (no further imports)
147-
-- +-- yops/yops-3.config
148-
-- +-- yops-4.config
149-
-- +-- yops/yops-5.config
150-
-- +-- yops-6.config
151-
-- +-- yops/yops-7.config
152-
-- +-- yops-8.config
153-
-- +-- yops/yops-9.config (no further imports)
154-
-- +-- yops/yops-5.config
155-
-- +-- yops-6.config
156-
-- +-- yops/yops-7.config
157-
-- +-- yops-8.config
158-
-- +-- yops/yops-9.config (no further imports)
159-
-- +-- yops/yops-7.config
160-
-- +-- yops-8.config
161-
-- +-- yops/yops-9.config (no further imports)
162-
-- +-- yops/yops-9.config (no further imports)
163-
log "checking that we detect when the same config is imported via many different paths"
164-
yopping <- cabal' "v2-build" [ "--project-file=yops-0.project" ]
165-
assertOutputContains "Warning: 2 imports" yopping
166-
167-
log "checking that we detect when the same config is imported via many different paths"
168-
wooping <- cabal' "v2-build" [ "--project-file=woops-0.project" ]
169-
assertOutputContains "Warning: 10 imports" wooping
170-
171136
log "checking bad conditional"
172137
badIf <- fails $ cabal' "v2-build" [ "--project-file=bad-conditional.project" ]
173138
assertOutputContains "Cannot set compiler in a conditional clause of a cabal project file" badIf

cabal-testsuite/PackageTests/ConditionalAndImport/woops-2.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops-4.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops-6.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops-8.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops/woops-1.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops/woops-3.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops/woops-5.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

cabal-testsuite/PackageTests/ConditionalAndImport/woops/woops-7.config

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)