reftest: add complete tests for the pin-depends feature

Author: rjbou

master_changes.md

@@ -152,6 +152,7 @@ users)
   * Add a test showing the behaviour of nested extra-files [#6715 @kit-ty-kate]
   * Add opam file loading tests to `update.test` to demonstrate current behaviour of loading full repository instead of only changed files. [#6614 @arozovyk @rjbou @kit-ty-kate]
   * Fix `env.test` in cases where calling `env` inside of a script outputs a `__CF_USER_TEXT_ENCODING` environment variable that isn't present in `sh -c env` [#6719 @kit-ty-kate]
+  * Add complete tests for the `pin-depends` feature [#6611 @rjbou]
 
 ### Engine
   * Fix gcc < 14.3 bug on mingw i686 [#6624 @kit-ty-kate]

src/client/opamSolution.ml

@@ -1098,7 +1098,8 @@ let confirmation ?ask requested solution =
   in
   ask <> Some true && OpamPackage.Name.Set.equal requested solution_packages ||
   let stats = OpamSolver.stats solution in
-  OpamConsole.confirm "\nProceed with %s?" (OpamSolver.string_of_stats stats)
+  OpamConsole.confirm ~name:"proceed-actions" "\nProceed with %s?"
+    (OpamSolver.string_of_stats stats)
 
 let run_hook_job t name ?(local=[]) ?(allow_stdout=false) w =
   let shell_env = OpamEnv.get_full ~set_opamroot:true ~set_opamswitch:true ~force_path:true t in

tests/reftests/dune.inc

@@ -1553,6 +1553,48 @@
    %{targets}
    (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:pat-sub.test} %{read-lines:testing-env}))))
 
+(rule
+ (alias reftest-pin-depends-ignore)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (action
+  (diff pin-depends-ignore.test pin-depends-ignore.out)))
+
+(alias
+ (name reftest)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (deps (alias reftest-pin-depends-ignore)))
+
+(rule
+ (targets pin-depends-ignore.out)
+ (deps root-N0REP0)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (package opam)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:pin-depends-ignore.test} %{read-lines:testing-env}))))
+
+(rule
+ (alias reftest-pin-depends)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (action
+  (diff pin-depends.test pin-depends.out)))
+
+(alias
+ (name reftest)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (deps (alias reftest-pin-depends)))
+
+(rule
+ (targets pin-depends.out)
+ (deps root-N0REP0)
+ (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (package opam)
+ (action
+  (with-stdout-to
+   %{targets}
+   (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:pin-depends.test} %{read-lines:testing-env}))))
+
 (rule
  (alias reftest-pin-depsonly-wtest-6501)
  (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))