From 8411781158bc9e00f85a3f3f17d1dfec883a6fa6 Mon Sep 17 00:00:00 2001 From: Gershom Bazerman <gershom@arista.com> Date: Thu, 2 Sep 2021 16:11:23 -0400 Subject: [PATCH] don't consider test flags in reconfigure check --- .../src/Distribution/Client/ProjectBuilding.hs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cabal-install/src/Distribution/Client/ProjectBuilding.hs b/cabal-install/src/Distribution/Client/ProjectBuilding.hs index fd5a99ae92..dba81b09b1 100644 --- a/cabal-install/src/Distribution/Client/ProjectBuilding.hs +++ b/cabal-install/src/Distribution/Client/ProjectBuilding.hs @@ -379,6 +379,12 @@ packageFileMonitorKeyValues elab = -- do not affect the configure step need to be nulled out. Those parts are -- the specific targets that we're going to build. -- + + -- Additionally we null out the parts that don't affect the configure step because they're simply + -- about how tests or benchmarks are run + + -- TODO there may be more things to null here too, in the future. + elab_config :: ElaboratedConfiguredPackage elab_config = elab { @@ -387,7 +393,14 @@ packageFileMonitorKeyValues elab = elabBenchTargets = [], elabReplTarget = Nothing, elabHaddockTargets = [], - elabBuildHaddocks = False + elabBuildHaddocks = False, + + elabTestMachineLog = Nothing, + elabTestHumanLog = Nothing, + elabTestShowDetails = Nothing, + elabTestKeepTix = False, + elabTestTestOptions = [], + elabBenchmarkOptions = [] } -- The second part is the value used to guard the build step. So this is -- GitLab