Skip to content

Commit 4d730b3

Browse files
authored
Disable hls tests for win and ghc-9.0.1 (#2018)
* Disable hls tests for win and ghc-9.0.1 * Unignore hlint tests for win and ghc-9.0.1
1 parent 6e47614 commit 4d730b3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
# run the tests without parallelism to avoid running out of memory
146146
run: cabal test ghcide --test-options="-j1 --rerun-update" || cabal test ghcide --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test ghcide --test-options="-j1 --rerun"
147147

148-
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }}
148+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && !(matrix.os == 'windows-latest' && matrix.ghc == '9.0.1')}}
149149
name: Test func-test suite
150150
env:
151151
HLS_TEST_EXE: hls

test/functional/FunctionalCodeAction.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,12 @@ hlintTests = testGroup "hlint suggestions" [
133133
testRefactor "ApplyRefact1.hs" "Redundant bracket"
134134
("{-# LANGUAGE LambdaCase #-}" : expectedLambdaCase)
135135

136-
, ignoreInEnv [HostOS Windows, GhcVer GHC90] "Test make execution does not terminate for windows and ghc-9.0" $
137-
expectFailBecause "apply-refact doesn't work with cpp" $
136+
, expectFailBecause "apply-refact doesn't work with cpp" $
138137
testCase "apply hints works with CPP via -XCPP argument" $ runHlintSession "cpp" $ do
139138
testRefactor "ApplyRefact3.hs" "Redundant bracket"
140139
expectedCPP
141140

142-
, ignoreInEnv [HostOS Windows, GhcVer GHC90] "Test make execution does not terminate for windows and ghc-9.0" $
143-
expectFailBecause "apply-refact doesn't work with cpp" $
141+
, expectFailBecause "apply-refact doesn't work with cpp" $
144142
testCase "apply hints works with CPP via language pragma" $ runHlintSession "" $ do
145143
testRefactor "ApplyRefact3.hs" "Redundant bracket"
146144
("{-# LANGUAGE CPP #-}" : expectedCPP)

0 commit comments

Comments
 (0)