diff --git a/cabal-testsuite/PackageTests/UserConfig/cabal.out b/cabal-testsuite/PackageTests/UserConfig/cabal.out index 7887050e85c2812c798e53e7bb8baa414e1eb2da..8dc64f170e1c4946cdbe43790a952f15c24a3186 100644 --- a/cabal-testsuite/PackageTests/UserConfig/cabal.out +++ b/cabal-testsuite/PackageTests/UserConfig/cabal.out @@ -6,3 +6,9 @@ cabal: <ROOT>/cabal.dist/cabal-config already exists. Writing default configuration to <ROOT>/cabal.dist/cabal-config # cabal user-config Writing default configuration to <ROOT>/cabal.dist/cabal-config2 +# cabal user-config +Renaming <ROOT>/cabal.dist/cabal-config to <ROOT>/cabal.dist/cabal-config.backup. +Writing merged config to <ROOT>/cabal.dist/cabal-config. +# cabal user-config +Renaming <ROOT>/cabal.dist/cabal-config to <ROOT>/cabal.dist/cabal-config.backup. +Writing merged config to <ROOT>/cabal.dist/cabal-config. diff --git a/cabal-testsuite/PackageTests/UserConfig/cabal.test.hs b/cabal-testsuite/PackageTests/UserConfig/cabal.test.hs index 32ad84982e1a35575b0dace40f4ce4df1dc1cee9..85d67212d4ced80f618208784cdaaab3df23dc1f 100644 --- a/cabal-testsuite/PackageTests/UserConfig/cabal.test.hs +++ b/cabal-testsuite/PackageTests/UserConfig/cabal.test.hs @@ -11,3 +11,7 @@ main = cabalTest $ do withEnv [("CABAL_CONFIG", Just conf2)] $ do cabal "user-config" ["init"] shouldExist conf2 + cabalG ["--config-file", conf] "user-config" ["update", "-f", "-a", "extra-prog-path: foo", "-a", "extra-prog-path: bar"] + assertFileDoesContain conf "foo,bar" + cabalG ["--config-file", conf] "user-config" ["update", "-f", "-a", "extra-prog-path: foo, bar"] + assertFileDoesContain conf "foo,bar"