Skip to content

Commit d9bac4e

Browse files
committed
Disable integration tests that require --install-ghc on ARM
1 parent 6691f10 commit d9bac4e

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

test/integration/lib/StackTest.hs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import System.IO
1313
import System.IO.Error
1414
import System.Process
1515
import System.Exit
16-
import System.Info (os)
16+
import System.Info (arch, os)
1717

1818
run' :: FilePath -> [String] -> IO ExitCode
1919
run' cmd args = do
@@ -176,6 +176,9 @@ isWindows = os == "mingw32"
176176
-- | Is the OS Alpine Linux?
177177
getIsAlpine = doesFileExist "/etc/alpine-release"
178178

179+
-- | Is the architecture ARM?
180+
isARM = arch == "arm"
181+
179182
-- | To avoid problems with GHC version mismatch when a new LTS major
180183
-- version is released, pass this argument to @stack@ when running in
181184
-- a global context. The LTS major version here should match that of

test/integration/tests/444-package-option/Main.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import StackTest
33
main :: IO ()
44
main = do
55
isAlpine <- getIsAlpine
6-
if isAlpine
7-
then logInfo "Disabled on Alpine Linux since it cannot yet install its own GHC."
6+
if isAlpine || isARM
7+
then logInfo "Disabled on Alpine Linux and ARM since it cannot yet install its own GHC."
88
else stack ["--install-ghc", "runghc", "--package", "safe", "Test.hs"]

test/integration/tests/cabal-solver/Main.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import System.Directory
44
main :: IO ()
55
main = do
66
isAlpine <- getIsAlpine
7-
if isAlpine
8-
then logInfo "Disabled on Alpine Linux since it cannot yet install its own GHC."
7+
if isAlpine || isARM
8+
then logInfo "Disabled on Alpine Linux and ARM since it cannot yet install its own GHC."
99
else do
1010
run "cabal" ["sandbox", "init"]
1111
stack ["unpack", "acme-dont-1.1"]

0 commit comments

Comments
 (0)