Skip to content

Commit 8bd5cc3

Browse files
committed
Revert "Disable relocatable tests on FreeBSD"
This reverts commit d660df0.
1 parent 638ac8a commit 8bd5cc3

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

cabal-testsuite/PackageTests/PathsModule/Executable-Relocatable/setup.test.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import Test.Cabal.Prelude
33

44
main = do
55
skipIfWindows "no relocatable builds"
6-
skipIfFreeBSD "no relocatable builds"
76
setupAndCabalTest $ do
87
skipUnlessGhcVersion ">= 8.0"
98
withPackageDb $ setup_build ["--enable-relocatable"]

cabal-testsuite/PackageTests/Regression/T4291/setup.test.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import Test.Cabal.Prelude
55
-- contains '..'
66
main = do
77
skipIfWindows "no relocatable builds"
8-
skipIfFreeBSD "no relocatable builds"
98
setupAndCabalTest $ withPackageDb $ do
109
skipUnlessGhcVersion ">= 7.6"
1110
env <- getTestEnv

cabal-testsuite/src/Test/Cabal/Prelude.hs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import Distribution.Simple.PackageDescription (readGenericPackageDescription)
3434
import Distribution.Simple.Program.Types
3535
import Distribution.Simple.Program.Db
3636
import Distribution.Simple.Program
37-
import Distribution.System (OS(Windows,Linux,OSX,FreeBSD), Arch(JavaScript), buildOS, buildArch)
37+
import Distribution.System (OS(Windows,Linux,OSX), Arch(JavaScript), buildOS, buildArch)
3838
import Distribution.Simple.Configure
3939
( getPersistBuildConfig )
4040
import Distribution.Simple.Utils
@@ -1058,9 +1058,6 @@ skipIfJavaScript = skipIfIO "incompatible with the JavaScript backend" isJavaScr
10581058
isWindows :: Bool
10591059
isWindows = buildOS == Windows
10601060

1061-
isFreeBSD :: Bool
1062-
isFreeBSD = buildOS == FreeBSD
1063-
10641061
isCI :: IO Bool
10651062
isCI = isJust <$> lookupEnv "CI"
10661063

@@ -1078,9 +1075,6 @@ isJavaScript = buildArch == JavaScript
10781075
skipIfWindows :: String -> IO ()
10791076
skipIfWindows why = skipIfIO ("Windows " <> why) isWindows
10801077

1081-
skipIfFreeBSD :: String -> IO ()
1082-
skipIfFreeBSD why = skipIfIO ("FreeBSD " <> why) isFreeBSD
1083-
10841078
skipUnlessWindows :: IO ()
10851079
skipUnlessWindows = skipIfIO "Only interesting in Windows" (not isWindows)
10861080

0 commit comments

Comments
 (0)