Fix ForeignLibs test for Windows

(cherry picked from commit be1ae31) # Conflicts: # cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs
haskell · Jul 21, 2024 · 617faf4 · 617faf4
1 parent 57e49de
commit 617faf4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/cabal-testsuite/PackageTests/ForeignLibs/MyForeignLib.def b/cabal-testsuite/PackageTests/ForeignLibs/MyForeignLib.def
@@ -0,0 +1,4 @@
+EXPORTS
+  sayHi
+  myForeignLibExit
+  myForeignLibInit
diff --git a/cabal-testsuite/PackageTests/ForeignLibs/my-foreign-lib.cabal b/cabal-testsuite/PackageTests/ForeignLibs/my-foreign-lib.cabal
@@ -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

diff --git a/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs b/cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs
@@ -29,8 +29,12 @@ main = setupAndCabalTest . recordMode DoNotRecord $ do
   skipUnlessGhcVersion ">= 7.8"
   win <- isWindows
   ghc94 <- isGhcVersion ">= 9.4.1"
+<<<<<<< HEAD
   expectBrokenIf (win && ghc94) 8451 $
     withPackageDb $ do
+=======
+  withPackageDb $ do
+>>>>>>> be1ae3183 (Fix ForeignLibs test for Windows)
         setup_install []
         setup "copy" [] -- regression test #4156
         dist_dir <- fmap testDistDir getTestEnv