From fe088561fd52795c5a620353e86f18b0708413dd Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <me@rgrinberg.com>
Date: Sat, 18 Jul 2026 02:04:05 +0100
Subject: [PATCH] refactor(opam): share modern build command generation

Parameterize the Dune 3 build command template by its runtest alias instead of maintaining separate templates for package-local runtest aliases.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
---
 src/dune_rules/opam_create.ml | 37 ++++-------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/dune_rules/opam_create.ml b/src/dune_rules/opam_create.ml
index 908ee198e8e..b783497d64e 100644
--- a/src/dune_rules/opam_create.ml
+++ b/src/dune_rules/opam_create.ml
@@ -62,36 +62,7 @@ let default_build_command =
   [ "dune" "install" "-p" name "--create-install-files" name ]
 ]
 |}))
-  and from_3_0 ~with_subst ~with_sites =
-    let subst = if with_subst then {|  [ "dune" "subst" ] {dev} |} else "" in
-    let promote_install_files =
-      if with_sites then {|  "--promote-install-files=false" |} else ""
-    in
-    let install =
-      if with_sites
-      then {| [ "dune" "install" "-p" name "--create-install-files" name ] |}
-      else ""
-    in
-    lazy
-      (Opam_file.parse_value
-         (Lexbuf.from_string
-            ~fname:"<internal>"
-            (Printf.sprintf
-               {|
-[
-  %s
-  [ "dune" "build" "-p" name "-j" jobs %s
-      "@install"
-      "@runtest" {with-test}
-      "@doc" {with-doc}
-  ]
-  %s
-]
-|}
-               subst
-               promote_install_files
-               install)))
-  and from_3_23 ~with_subst ~with_sites ~runtest =
+  and from_3_0 ~with_subst ~with_sites ~runtest =
     let subst = if with_subst then {|  [ "dune" "subst" ] {dev} |} else "" in
     let promote_install_files =
       if with_sites then {|  "--promote-install-files=false" |} else ""
@@ -135,12 +106,12 @@ let default_build_command =
        else if version < (3, 0)
        then from_2_9
        else if version < (3, 23)
-       then from_3_0 ~with_subst ~with_sites
+       then from_3_0 ~with_subst ~with_sites ~runtest:"@runtest"
        else (
          match Package.exclusive_dir package with
-         | None -> from_3_0 ~with_subst ~with_sites
+         | None -> from_3_0 ~with_subst ~with_sites ~runtest:"@runtest"
          | Some (_loc, dir) ->
-           from_3_23
+           from_3_0
              ~with_subst
              ~with_sites
              ~runtest:("@runtest/" ^ Path.Source.to_string dir)))