fix-reftests

ocaml · Sep 25, 2024 · cf2f658 · cf2f658
1 parent 99d218c
commit cf2f658
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/tests/reftests/download.test b/tests/reftests/download.test
@@ -66,7 +66,7 @@ Processing 1/1: [foo.1: http]
 + curl "--another-args" "3"
 [ERROR] Failed to get sources of foo.1: curl failed
 
-OpamSolution.Fetch_fail("https://github.com/UnixJunkie/get_line/archive/v1.0.0.tar.gz (curl failed: \"curl --another-args 3\" exited with code 2)")
+OpamSolution.Fetch_fail("https://github.com/UnixJunkie/get_line/archive/v1.0.0.tar.gz (curl failed: \"'/usr/bin/curl' '--another-args' '3'\" exited with code 2)")
 
 
 <><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>

diff --git a/tests/reftests/git.test b/tests/reftests/git.test
@@ -58,7 +58,7 @@ The following actions will be performed:
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 [ERROR] Could not synchronize ${BASEDIR}/OPAM/submodule/.opam-switch/sources/submodule.1 from "git+file://${BASEDIR}/use-submodule":
- "git submodule update --init --recursive" exited with code 1
+ "'/usr/bin/git' 'submodule' 'update' '--init' '--recursive'" exited with code 1
 [ERROR] Failed to get sources of submodule.1: git+file://${BASEDIR}/use-submodule
 
 OpamSolution.Fetch_fail("git+file://${BASEDIR}/use-submodule")

diff --git a/tests/reftests/json.unix.test b/tests/reftests/json.unix.test
@@ -336,7 +336,7 @@ The following actions will be performed:
  "info": {
  "context": "currentv | linux/x86_64 | | file://${BASEDIR}/REPO",
  "path": "${BASEDIR}/OPAM/json-empty/.opam-switch/build/ko.2",
- "command": "${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh build false",
+ "command": "'${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh' 'build' 'false'",
  "exit-code": "1",
  "env-file": "${BASEDIR}/OPAM/log/ko.env",
  "output-file": "${BASEDIR}/OPAM/log/ko.out"
@@ -497,7 +497,7 @@ The former state can be restored with:
  "info": {
  "context": "currentv | linux/x86_64 | | file://${BASEDIR}/REPO",
  "path": "${BASEDIR}/OPAM/json-empty/.opam-switch/build/ko.2",
- "command": "${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh build false",
+ "command": "'${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh' 'build' 'false'",
  "exit-code": "1",
  "env-file": "${BASEDIR}/OPAM/log/ko.env",
  "output-file": "${BASEDIR}/OPAM/log/ko.out"

diff --git a/tests/reftests/repository.test b/tests/reftests/repository.test
@@ -320,15 +320,15 @@ opam-version: "2.0"
 first --
 ### ::: rsync - git :::
 ### opam repository set-url oper git+file://$BASEDIR/OPER4 | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://${BASEDIR}/OPER4 fails, reverting to file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
 # Packages matching: from-repository(oper) & available
 # Name # Installed # Synopsis
 first --
 ### opam repository set-url oper git+file://./OPER3#unknownbranch | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://./OPER3#unknownbranch fails, reverting to file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
@@ -359,15 +359,15 @@ first --
 first --
 ### ::: git - git :::
 ### opam repository set-url oper git+file://$BASEDIR/OPER4 | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://${BASEDIR}/OPER4 fails, reverting to git+file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
 # Packages matching: from-repository(oper) & available
 # Name # Installed # Synopsis
 first --
 ### opam repository set-url oper git+file://./OPER3#unknownbranch | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://./OPER3#unknownbranch fails, reverting to git+file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
@@ -486,15 +486,15 @@ opam-version: "2.0"
 first --
 ### :::: rsync - git ::::
 ### opam repository set-url oper git+file://$BASEDIR/OPER4 | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://${BASEDIR}/OPER4 fails, reverting to file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
 # Packages matching: from-repository(oper) & available
 # Name # Installed # Synopsis
 first --
 ### opam repository set-url oper git+file://./OPER3#unknownbranch | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://./OPER3#unknownbranch fails, reverting to file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
@@ -525,15 +525,15 @@ first --
 first --
 ### :::: git - git ::::
 ### opam repository set-url oper git+file://$BASEDIR/OPER4 | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://${BASEDIR}/OPER4 fails, reverting to git+file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper
 # Packages matching: from-repository(oper) & available
 # Name # Installed # Synopsis
 first --
 ### opam repository set-url oper git+file://./OPER3#unknownbranch | sed-cmd git
-[ERROR] Could not update repository "oper": "git fetch -q" exited with code 128
+[ERROR] Could not update repository "oper": "'/usr/bin/git' 'fetch' '-q'" exited with code 128
 [ERROR] Fetching repository oper with git+file://./OPER3#unknownbranch fails, reverting to git+file://${BASEDIR}/OPER
 # Return code 40 #
 ### opam list --available --repo=oper

diff --git a/tests/reftests/swhid.unix.test b/tests/reftests/swhid.unix.test
@@ -39,7 +39,7 @@ The following actions will be performed:
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 [ERROR] Failed to get sources of snappy-ko.2: Download command failed
 
-OpamSolution.Fetch_fail("https://fake.exe/url.tar.gz (Download command failed: \"curl --write-out %{http_code}\\n --retry 3 --retry-delay 2 --user-agent opam/current -L -o ${OPAMTMP}/url.tar.gz.part -- https://fake.exe/url.tar.gz\" exited with code 6)")
+OpamSolution.Fetch_fail("https://fake.exe/url.tar.gz (Download command failed: \"'/usr/bin/curl' '--write-out' '%{http_code}\\n' '--retry' '3' '--retry-delay' '2' '--user-agent' 'opam/current' '-L' '-o' '${OPAMTMP}/url.tar.gz.part' '--' 'https://fake.exe/url.tar.gz'\" exited with code 6)")
 
 
 <><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
@@ -68,7 +68,7 @@ The following actions will be performed:
 Processing 1/3: [snappy-swhid-dir.2: http]
 [ERROR] Failed to get sources of snappy-swhid-dir.2: Download command failed
 
-OpamSolution.Fetch_fail("https://fake.exe/url.tar.gz (Download command failed: \"curl --write-out %{http_code}\\n --retry 3 --retry-delay 2 --user-agent opam/current -L -o ${OPAMTMP}/url.tar.gz.part -- https://fake.exe/url.tar.gz\" exited with code 6)")
+OpamSolution.Fetch_fail("https://fake.exe/url.tar.gz (Download command failed: \"'/usr/bin/curl' '--write-out' '%{http_code}\\n' '--retry' '3' '--retry-delay' '2' '--user-agent' 'opam/current' '-L' '-o' '${OPAMTMP}/url.tar.gz.part' '--' 'https://fake.exe/url.tar.gz'\" exited with code 6)")
 
 
 <><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>