From c2d1641b3e2b77a5f41b5c134ca7e07bbcf2aec0 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Thu, 12 Dec 2024 09:40:06 -0500 Subject: [PATCH] Remove an additional test on yops project - checking "using config from message" without URI imports --- .../ConditionalAndImport/cabal.test.hs | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs index 31bdf80ee4e..67118d362c0 100644 --- a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs +++ b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs @@ -258,41 +258,6 @@ main = cabalTest . withRepo "repo" . recordMode RecordMarked $ do log "checking if we detect when the same config is imported via many different paths (we don't)" yopping <- cabal' "v2-build" [ "--project-file=yops-0.project" ] - log "checking \"using config from message\" without URI imports" - withDirectory "yops" $ do - yopping <- fails $ cabal' "v2-build" [ "--dry-run", "--project-file=../yops-0.project" ] - - -- Use assertRegex when the output is tainted by the temp directory, like - -- this: - -- - -- When using configuration from: - -- - /tmp/cabal-testsuite-286573/yops-0.project - -- - /tmp/cabal-testsuite-286573/yops-2.config etc - -- - -- The addition of the /tmp/cabal-testsuite-*/ prefix, I observed on Ubuntu - -- but not on Windows. - assertRegex - "Project configuration without URI imports is listed in full" - "When using configuration from:(\n|\r\n) \ - \ .*yops-0\\.project(\n|\r\n) \ - \ .*yops-2\\.config(\n|\r\n) \ - \ .*yops-4\\.config(\n|\r\n) \ - \ .*yops-6\\.config(\n|\r\n) \ - \ .*yops-8\\.config(\n|\r\n) \ - \ .*yops-1\\.config(\n|\r\n) \ - \ .*yops-3\\.config(\n|\r\n) \ - \ .*yops-5\\.config(\n|\r\n) \ - \ .*yops-7\\.config(\n|\r\n) \ - \ .*yops-9\\.config(\n|\r\n)" - yopping - - assertOutputContains - "The following errors occurred: \ - \ - The package directory '.' does not contain any .cabal file." - yopping - - return () - log "checking bad conditional" badIf <- fails $ cabal' "v2-build" [ "--project-file=bad-conditional.project" ] assertOutputContains "Cannot set compiler in a conditional clause of a cabal project file" badIf