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

Fix ForeignLibs test for Windows #10212

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Fix ForeignLibs test for Windows #10212

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
4 changes: 4 additions & 0 deletions cabal-testsuite/PackageTests/ForeignLibs/MyForeignLib.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
EXPORTS
sayHi
myForeignLibExit
myForeignLibInit
3 changes: 2 additions & 1 deletion cabal-testsuite/PackageTests/ForeignLibs/my-foreign-lib.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ foreign-library myforeignlib
type: native-shared

if os(windows)
options: standalone
options: standalone
mod-def-file: MyForeignLib.def

other-modules: MyForeignLib.Hello
MyForeignLib.SomeBindings
Expand Down
3 changes: 1 addition & 2 deletions cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ main = setupAndCabalTest . recordMode DoNotRecord $ do
-- Foreign libraries don't work with GHC 7.6 and earlier
skipUnlessGhcVersion ">= 7.8"
ghc94 <- isGhcVersion ">= 9.4.1"
expectBrokenIf (isWindows && ghc94) 8451 $
withPackageDb $ do
withPackageDb $ do
setup_install []
setup "copy" [] -- regression test #4156
dist_dir <- fmap testDistDir getTestEnv
Expand Down
Loading