From de4d7f80e2ad70d275ddf0fa5ab32b755bb326bf Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 14 Jul 2021 07:31:44 +0200 Subject: [PATCH 1/2] Disable hls tests for win and ghc-9.0.1 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6fcd46490..bb73c81969 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -145,7 +145,7 @@ jobs: # run the tests without parallelism to avoid running out of memory 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" - - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test }} + - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && !(matrix.os == 'windows-latest' && matrix.ghc == '9.0.1')}} name: Test func-test suite env: HLS_TEST_EXE: hls From 4bffba1205411e674cf69d18583edad566e295db Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 14 Jul 2021 08:00:07 +0200 Subject: [PATCH 2/2] Unignore hlint tests for win and ghc-9.0.1 --- test/functional/FunctionalCodeAction.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/functional/FunctionalCodeAction.hs b/test/functional/FunctionalCodeAction.hs index 97881fff6e..f598cf5ddd 100644 --- a/test/functional/FunctionalCodeAction.hs +++ b/test/functional/FunctionalCodeAction.hs @@ -133,14 +133,12 @@ hlintTests = testGroup "hlint suggestions" [ testRefactor "ApplyRefact1.hs" "Redundant bracket" ("{-# LANGUAGE LambdaCase #-}" : expectedLambdaCase) - , ignoreInEnv [HostOS Windows, GhcVer GHC90] "Test make execution does not terminate for windows and ghc-9.0" $ - expectFailBecause "apply-refact doesn't work with cpp" $ + , expectFailBecause "apply-refact doesn't work with cpp" $ testCase "apply hints works with CPP via -XCPP argument" $ runHlintSession "cpp" $ do testRefactor "ApplyRefact3.hs" "Redundant bracket" expectedCPP - , ignoreInEnv [HostOS Windows, GhcVer GHC90] "Test make execution does not terminate for windows and ghc-9.0" $ - expectFailBecause "apply-refact doesn't work with cpp" $ + , expectFailBecause "apply-refact doesn't work with cpp" $ testCase "apply hints works with CPP via language pragma" $ runHlintSession "" $ do testRefactor "ApplyRefact3.hs" "Redundant bracket" ("{-# LANGUAGE CPP #-}" : expectedCPP)