From 6614dab20e6c857c6c93fc0ddd53c095c8a39d86 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 9 Feb 2021 06:10:02 +0100 Subject: [PATCH] Replace 8.10.1 with 8.10.4 in wrapper test --- test/wrapper/Main.hs | 4 ++-- test/wrapper/testdata/stack-8.10.1/stack.yaml | 1 - test/wrapper/testdata/{stack-8.10.1 => stack-8.10.4}/Lib.hs | 0 .../wrapper/testdata/{stack-8.10.3 => stack-8.10.4}/foo.cabal | 0 test/wrapper/testdata/stack-8.10.4/stack.yaml | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 test/wrapper/testdata/stack-8.10.1/stack.yaml rename test/wrapper/testdata/{stack-8.10.1 => stack-8.10.4}/Lib.hs (100%) rename test/wrapper/testdata/{stack-8.10.3 => stack-8.10.4}/foo.cabal (100%) create mode 100644 test/wrapper/testdata/stack-8.10.4/stack.yaml diff --git a/test/wrapper/Main.hs b/test/wrapper/Main.hs index e071327f81c..06aef44d258 100644 --- a/test/wrapper/Main.hs +++ b/test/wrapper/Main.hs @@ -18,8 +18,8 @@ main = do projectGhcVersionTests :: TestTree projectGhcVersionTests = testGroup "--project-ghc-version" - [ testCase "stack with ghc 8.10.1" $ - testDir "test/wrapper/testdata/stack-8.10.1" "8.10.1" + [ testCase "stack with ghc 8.10.4" $ + testDir "test/wrapper/testdata/stack-8.10.4" "8.10.4" , testCase "stack with ghc 8.8.3" $ testDir "test/wrapper/testdata/stack-8.8.3" "8.8.3" , testCase "cabal with global ghc" $ do diff --git a/test/wrapper/testdata/stack-8.10.1/stack.yaml b/test/wrapper/testdata/stack-8.10.1/stack.yaml deleted file mode 100644 index 409e7fe489f..00000000000 --- a/test/wrapper/testdata/stack-8.10.1/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: ghc-8.10.1 diff --git a/test/wrapper/testdata/stack-8.10.1/Lib.hs b/test/wrapper/testdata/stack-8.10.4/Lib.hs similarity index 100% rename from test/wrapper/testdata/stack-8.10.1/Lib.hs rename to test/wrapper/testdata/stack-8.10.4/Lib.hs diff --git a/test/wrapper/testdata/stack-8.10.3/foo.cabal b/test/wrapper/testdata/stack-8.10.4/foo.cabal similarity index 100% rename from test/wrapper/testdata/stack-8.10.3/foo.cabal rename to test/wrapper/testdata/stack-8.10.4/foo.cabal diff --git a/test/wrapper/testdata/stack-8.10.4/stack.yaml b/test/wrapper/testdata/stack-8.10.4/stack.yaml new file mode 100644 index 00000000000..361dfba3308 --- /dev/null +++ b/test/wrapper/testdata/stack-8.10.4/stack.yaml @@ -0,0 +1 @@ +resolver: ghc-8.10.4