Keep rules marked promote until-clean with -p

Closes ocaml#4401

Signed-off-by: Etienne Millon <me@emillon.org>

Author: emillon

CHANGES.md

@@ -21,6 +21,10 @@
 - Fix handling of the `(deps)` field in `(test)` stanzas when there is an
   `.expected` file. (#5952, #5951, fixes #5950, @emillon)
 
+- Do not ignore rules marked `(promote (until-clean))` when
+  `--ignore-promoted-rules` (or `-p`) is passed. (#...., #...., fixes #4401,
+  @emillon)
+
 3.3.1 (19-06-2022)
 ------------------
 

src/dune_rules/dune_file.ml

@@ -2332,15 +2332,27 @@ type t =
   ; stanzas : Stanzas.t
   }
 
+let is_promoted_rule version rule =
+  let is_promoted_mode = function
+    | Rule.Mode.Promote { only = None; lifetime; _ } ->
+      if version >= (3, 4) then
+        match lifetime with
+        | Unlimited -> true
+        | Until_clean -> false
+      else true
+    | _ -> false
+  in
+  match rule with
+  | Rule { mode; _ } | Menhir.T { mode; _ } -> is_promoted_mode mode
+  | _ -> false
+
 let parse sexps ~dir ~file ~project =
   let open Memo.O in
   let+ stanzas = Stanzas.parse ~file project sexps in
   let stanzas =
     if !Clflags.ignore_promoted_rules then
-      List.filter stanzas ~f:(function
-        | Rule { mode = Rule.Mode.Promote { only = None; _ }; _ }
-        | Menhir.T { mode = Rule.Mode.Promote { only = None; _ }; _ } -> false
-        | _ -> true)
+      let version = Dune_project.dune_version project in
+      List.filter stanzas ~f:(fun s -> not (is_promoted_rule version s))
     else stanzas
   in
   { dir; project; stanzas }

test/blackbox-tests/test-cases/github4401.t

@@ -21,3 +21,12 @@ are ignored. See #4401.
   Error: No rule found for test
   -> required by alias runtest in dune:5
   [1]
+
+This is correctly ignored if dune-lang is bumped to 3.4.
+
+  $ cat > dune-project << EOF
+  > (lang dune 3.4)
+  > EOF
+
+  $ dune clean
+  $ dune runtest --ignore-promoted-rules