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

*.project.* files use program-options to specify -fno-ignore-asserts #8350

Merged
merged 1 commit into from
Oct 19, 2022
Merged

*.project.* files use program-options to specify -fno-ignore-asserts #8350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 1 addition & 28 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,5 @@ constraints: these -assoc
constraints: text >= 2.0
constraints: time >= 1.12

-- So us hackers get all the assertion failures early:
--
-- NOTE: currently commented out, see
-- https://github.com/haskell/cabal/issues/3911
-- as a workaround we specify it for each package individually:
--
-- program-options
-- ghc-options: -fno-ignore-asserts
--
package Cabal
ghc-options: -fno-ignore-asserts

package cabal-testsuite
ghc-options: -fno-ignore-asserts

package Cabal-QuickCheck
ghc-options: -fno-ignore-asserts

package Cabal-tree-diff
ghc-options: -fno-ignore-asserts

package Cabal-described
ghc-options: -fno-ignore-asserts

package cabal-install-solver
ghc-options: -fno-ignore-asserts

package cabal-install
program-options
ghc-options: -fno-ignore-asserts
11 changes: 3 additions & 8 deletions cabal.project.coverage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ allow-newer: windns-0.1.0.1:base
constraints: rere -rere-cfg
constraints: these

program-options
ghc-options: -fno-ignore-asserts

-- NOTE: for library coverage in multi-project builds,
-- see:
--
Expand All @@ -39,41 +42,33 @@ constraints: these
-- the `cabal-install` library
--
package Cabal-syntax
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package Cabal
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package cabal-testsuite
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package Cabal-QuickCheck
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package Cabal-tree-diff
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package Cabal-described
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package cabal-install-solver
ghc-options: -fno-ignore-asserts
coverage: False
library-coverage: False

package cabal-install
ghc-options: -fno-ignore-asserts
coverage: True
library-coverage: True
13 changes: 0 additions & 13 deletions cabal.project.libonly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,4 @@ tests: True
--optional-packages: */

program-options
-- So us hackers get all the assertion failures early:
--
-- NOTE: currently commented out, see
-- https://github.com/haskell/cabal/issues/3911
--
-- ghc-options: -fno-ignore-asserts
--
-- as a workaround we specify it for each package individually:
package Cabal-syntax
ghc-options: -fno-ignore-asserts
package Cabal
ghc-options: -fno-ignore-asserts
package cabal-testsuite
ghc-options: -fno-ignore-asserts
11 changes: 7 additions & 4 deletions cabal.project.validate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ constraints: these -assoc

write-ghc-environment-files: never

program-options
ghc-options: -fno-ignore-asserts

package Cabal-syntax
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror
package Cabal
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror
package cabal-testsuite
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror
package cabal-install
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror
9 changes: 6 additions & 3 deletions cabal.project.validate.libonly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ write-ghc-environment-files: never
constraints: rere -rere-cfg
constraints: these -assoc

program-options
ghc-options: -fno-ignore-asserts

package Cabal-syntax
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror
package Cabal
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror
package cabal-testsuite
ghc-options: -Werror -fno-ignore-asserts
ghc-options: -Werror

-- https://github.com/haskell-hvr/cryptohash-sha256/issues/12
allow-newer: cryptohash-sha256:base