Merge pull request #6675 from rjbou/reftest-sed-cmd

Reftest: update `sed-cmd`

Author: kit-ty-kate

master_changes.md

@@ -111,6 +111,7 @@ users)
 ## Internal
   * Replace every polymorphic uses of `List.mem` by a version that doesn't use `Repr.equal` [#6644 @kit-ty-kate]
   * Simplify the `src_ext/update-sources.sh` script [#6701 @kit-ty-kate]
+  * Homogeneise verbose command output between sandboxed and non sandboxed one [#6675 @rjbou]
 
 ## Internal: Unix
 
@@ -137,11 +138,14 @@ users)
   * Add a test showing the behaviour of version pins when one of the dependencies isn't up-to-date [#6691 @kit-ty-kate]
   * Add a test showing the behaviour of pre-defined variables in command hooks [#6659 @rjbou]
   * Add a test showing the behaviour of `opam var <pkg>:opamfile` [#6659 @kit-ty-kate]
+  * Add a test to show homogeneity of outputs on verbose between sandboxed and non sandboxed commands (with `-vv`) [#6675 @rjbou]
+  * Update `sed-cmd` reftest reftest [#6675 @rjbou]
 
 ### Engine
   * Fix gcc < 14.3 bug on mingw i686 [#6624 @kit-ty-kate]
   * Fix support for removing local link directories [#6450 @kit-ty-kate]
   * Bump `OPAM_REPO_SHA` in the github action workflows to allow patch 3.0.0 [#6663 @kit-ty-kate]
+  * Allow `sed-cmd` to parse even if no space is after the command [#6675 @rjbou]
 
 ## Github Actions
   * bump `actions/checkout` from 4 to 5 [#6643 @kit-ty-kate]

src/core/opamProcess.ml

@@ -580,10 +580,15 @@ let dry_run_background c = {
 }
 
 let verbose_print_cmd p =
-  OpamConsole.msg "%s %s %s%s\n"
+  let args =
+    match p.p_args with
+    | [] -> ""
+    | args ->
+      " " ^ OpamStd.List.concat_map " " (Printf.sprintf "%S") args
+  in
+  OpamConsole.msg "%s %s%s%s\n"
     (OpamConsole.colorise `yellow "+")
-    p.p_name
-    (OpamStd.List.concat_map " " (Printf.sprintf "%S") p.p_args)
+    p.p_name args
     (if p.p_cwd = Sys.getcwd () then ""
      else Printf.sprintf " (CWD=%s)" p.p_cwd)
 

tests/reftests/depexts.test

@@ -25,7 +25,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1
@@ -210,7 +210,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1 depext-avail depext-ok depext-unav
@@ -243,7 +243,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1 depext-avail depext-unav
@@ -304,7 +304,7 @@ opam believes some required external dependencies are missing. opam can:
 
 [1/2/3/4] 1
 
-+ false 
++ false
 [ERROR] System package install failed with exit code 1 at command:
             false
 [ERROR] These packages are still missing: depext-1 depext-avail depext-ok depext-unav

tests/reftests/dune.inc

@@ -1616,6 +1616,27 @@
    %{targets}
    (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:pin.test} %{read-lines:testing-env}))))
 
+(rule
+ (alias reftest-process-output.unix)
+ (enabled_if (and (= %{os_type} "Unix") (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (action
+  (diff process-output.unix.test process-output.unix.out)))
+
+(alias
+ (name reftest)
+ (enabled_if (and (= %{os_type} "Unix") (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))
+ (deps (alias reftest-process-output.unix)))
+
+(rule
+ (targets process-output.unix.out)
+ (deps root-N0REP0)
+ (enabled_if (and (= %{os_type} "Unix") (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:process-output.unix.test} %{read-lines:testing-env}))))
+
 (rule
  (alias reftest-rebuild)
  (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))

tests/reftests/process-output.unix.test

@@ -0,0 +1,34 @@
+N0REP0
+### :: Check that process verbose display is the same with or without sandbox
+### :: (no trailing space or quotes)
+### : disable sandbox for install commands
+### opam option 'wrap-install-commands=[]'
+Set to '[]' the field wrap-install-commands in global configuration
+### <pkg:process.1>
+opam-version: "2.0"
+build: [
+  [ "true" ]
+  [ "true" "with" "option" ]
+]
+install: [
+  [ "true" ]
+  [ "true" "with" "option" ]
+]
+### opam switch create outputs --empty
+### opam install process -vv -y | sed-cmd true
+The following actions will be performed:
+=== install 1 package
+  - install process 1
+
+<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+Processing  2/3: [process: true]
++ true (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
+Processing  2/3: [process: true with]
++ true "with" "option" (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
+-> compiled  process.1
+Processing  3/3: [process: true]
++ true (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
+Processing  3/3: [process: true with]
++ true "with" "option" (CWD=${BASEDIR}/OPAM/outputs/.opam-switch/build/process.1)
+-> installed process.1
+Done.