fixup! fixup! reftest: add test for variables resolutions in filter, for all fields

Author: rjbou

tests/reftests/filter-variable-resolution.test

@@ -45,15 +45,15 @@ build: [
   [ "grep" "ploplop" "some-content" ]
   [ "grep" "bloblob" "some-content" ]
 ]
-### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
+### opam install patches -vv | sed-cmd patch | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
 The following actions will be performed:
 === install 1 package
   - install patches 1
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 [patches: patch] applying to-apply.patch
 Processing  2/3: [patches: patch]
-+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
+patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
 - patching file some-content
 Processing  2/3: [patches: grep ploplop]
 grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
@@ -295,15 +295,15 @@ build: [
   [ "grep" "ploplop" "some-content" ]
   [ "grep" "bloblob" "some-content" ]
 ]
-### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
+### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd patch | sed-cmd grep |  unordered
 The following actions will be performed:
 === install 1 package
   - install patches 1
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 [patches: patch] applying to-apply.patch
 Processing  2/3: [patches: patch]
-+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
+patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
 - patching file some-content
 Processing  2/3: [patches: grep ploplop]
 grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
@@ -554,15 +554,15 @@ build: [
   [ "grep" "ploplop" "some-content" ]
   [ "grep" "bloblob" "some-content" ]
 ]
-### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
+### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | sed-cmd patch | unordered
 The following actions will be performed:
 === install 1 package
   - install patches 1
 
 <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
 [patches: patch] applying to-apply.patch
 Processing  2/3: [patches: patch]
-+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
+patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
 - patching file some-content
 Processing  2/3: [patches: grep ploplop]
 grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)