Skip to content

Commit a9c2253

Browse files
rjbourjbou
committed
fixup! reftest: add test for variables resolutions in filter, for all fields
1 parent 0f61464 commit a9c2253

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

‎tests/reftests/filter-variable-resolution.test

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ build: [
4545
[ "grep" "ploplop" "some-content" ]
4646
[ "grep" "bloblob" "some-content" ]
4747
]
48-
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | unordered
48+
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
4949
The following actions will be performed:
5050
=== install 1 package
5151
- install patches 1
@@ -56,10 +56,10 @@ Processing 2/3: [patches: patch]
5656
+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
5757
- patching file some-content
5858
Processing 2/3: [patches: grep ploplop]
59-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
59+
grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
6060
- ploplop
6161
Processing 2/3: [patches: grep bloblob]
62-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "bloblob" "some-content" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
62+
grep "bloblob" "some-content" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/patches.1)
6363
- bloblob
6464
-> compiled patches.1
6565
-> installed patches.1
@@ -71,14 +71,14 @@ build: [
7171
[ "true" { ?smtg } ]
7272
[ "false" { !?smtg } ]
7373
]
74-
### opam install build -vv | unordered
74+
### opam install build -vv | sed-cmd true | unordered
7575
The following actions will be performed:
7676
=== install 1 package
7777
- install build 1
7878

7979
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
8080
Processing 2/3: [build: true]
81-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "true" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/build.1)
81+
true (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/build.1)
8282
-> compiled build.1
8383
-> installed build.1
8484
Done.
@@ -89,14 +89,14 @@ install: [
8989
[ "true" { ?smtg } ]
9090
[ "false" { !?smtg } ]
9191
]
92-
### opam install install -vv | unordered
92+
### opam install install -vv | sed-cmd true | unordered
9393
The following actions will be performed:
9494
=== install 1 package
9595
- install install 1
9696

9797
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
9898
Processing 3/3: [install: true]
99-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "install" "true" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/install.1)
99+
true (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/install.1)
100100
-> installed install.1
101101
Done.
102102
### :I:4: runtest :::
@@ -106,14 +106,14 @@ run-test: [
106106
[ "true" { ?smtg } ]
107107
[ "false" { !?smtg } ]
108108
]
109-
### opam install runtest --with-test -vv | unordered
109+
### opam install runtest --with-test -vv | sed-cmd true | unordered
110110
The following actions will be performed:
111111
=== install 1 package
112112
- install runtest 1
113113

114114
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
115115
Processing 2/3: [runtest: true]
116-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "true" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/runtest.1)
116+
true (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/build/runtest.1)
117117
-> compiled runtest.1
118118
-> installed runtest.1
119119
Done.
@@ -132,14 +132,14 @@ The following actions will be performed:
132132
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
133133
-> installed remove.1
134134
Done.
135-
### opam remove remove -vv | unordered
135+
### opam remove remove -vv | sed-cmd true | unordered
136136
The following actions will be performed:
137137
=== remove 1 package
138138
- remove remove 1
139139

140140
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
141141
Processing 2/2: [remove: true]
142-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "remove" "true" (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/remove/remove.1)
142+
true (CWD=${BASEDIR}/OPAM/global-variable/.opam-switch/remove/remove.1)
143143
-> removed remove.1
144144
Done.
145145
### :I:6: depends :::
@@ -295,7 +295,7 @@ build: [
295295
[ "grep" "ploplop" "some-content" ]
296296
[ "grep" "bloblob" "some-content" ]
297297
]
298-
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | unordered
298+
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
299299
The following actions will be performed:
300300
=== install 1 package
301301
- install patches 1
@@ -306,10 +306,10 @@ Processing 2/3: [patches: patch]
306306
+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
307307
- patching file some-content
308308
Processing 2/3: [patches: grep ploplop]
309-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
309+
grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
310310
- ploplop
311311
Processing 2/3: [patches: grep bloblob]
312-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "bloblob" "some-content" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
312+
grep "bloblob" "some-content" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/patches.1)
313313
- bloblob
314314
-> compiled patches.1
315315
-> installed patches.1
@@ -321,14 +321,14 @@ build: [
321321
[ "true" { ?smtg } ]
322322
[ "false" { !?smtg } ]
323323
]
324-
### opam install build -vv | unordered
324+
### opam install build -vv | sed-cmd true | unordered
325325
The following actions will be performed:
326326
=== install 1 package
327327
- install build 1
328328

329329
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
330330
Processing 2/3: [build: true]
331-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "true" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/build.1)
331+
true (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/build.1)
332332
-> compiled build.1
333333
-> installed build.1
334334
Done.
@@ -339,14 +339,14 @@ install: [
339339
[ "true" { ?smtg } ]
340340
[ "false" { !?smtg } ]
341341
]
342-
### opam install install -vv | unordered
342+
### opam install install -vv | sed-cmd true | unordered
343343
The following actions will be performed:
344344
=== install 1 package
345345
- install install 1
346346

347347
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
348348
Processing 3/3: [install: true]
349-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "install" "true" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/install.1)
349+
true (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/install.1)
350350
-> installed install.1
351351
Done.
352352
### :II:4: runtest :::
@@ -356,14 +356,14 @@ run-test: [
356356
[ "true" { ?smtg } ]
357357
[ "false" { !?smtg } ]
358358
]
359-
### opam install runtest --with-test -vv | unordered
359+
### opam install runtest --with-test -vv | sed-cmd true | unordered
360360
The following actions will be performed:
361361
=== install 1 package
362362
- install runtest 1
363363

364364
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
365365
Processing 2/3: [runtest: true]
366-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "true" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/runtest.1)
366+
true (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/build/runtest.1)
367367
-> compiled runtest.1
368368
-> installed runtest.1
369369
Done.
@@ -382,14 +382,14 @@ The following actions will be performed:
382382
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
383383
-> installed remove.1
384384
Done.
385-
### opam remove remove -vv | unordered
385+
### opam remove remove -vv | sed-cmd true | unordered
386386
The following actions will be performed:
387387
=== remove 1 package
388388
- remove remove 1
389389

390390
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
391391
Processing 2/2: [remove: true]
392-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "remove" "true" (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/remove/remove.1)
392+
true (CWD=${BASEDIR}/OPAM/switch-variable/.opam-switch/remove/remove.1)
393393
-> removed remove.1
394394
Done.
395395
### :II:6: depends :::
@@ -554,7 +554,7 @@ build: [
554554
[ "grep" "ploplop" "some-content" ]
555555
[ "grep" "bloblob" "some-content" ]
556556
]
557-
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | unordered
557+
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
558558
The following actions will be performed:
559559
=== install 1 package
560560
- install patches 1
@@ -565,10 +565,10 @@ Processing 2/3: [patches: patch]
565565
+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
566566
- patching file some-content
567567
Processing 2/3: [patches: grep ploplop]
568-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
568+
grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
569569
- ploplop
570570
Processing 2/3: [patches: grep bloblob]
571-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "bloblob" "some-content" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
571+
grep "bloblob" "some-content" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/patches.1)
572572
- bloblob
573573
-> compiled patches.1
574574
-> installed patches.1
@@ -580,14 +580,14 @@ build: [
580580
[ "true" { ?v:smtg } ]
581581
[ "false" { !?v:smtg } ]
582582
]
583-
### opam install build -vv | unordered
583+
### opam install build -vv | sed-cmd true | unordered
584584
The following actions will be performed:
585585
=== install 1 package
586586
- install build 1
587587

588588
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
589589
Processing 2/3: [build: true]
590-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "true" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/build.1)
590+
true (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/build.1)
591591
-> compiled build.1
592592
-> installed build.1
593593
Done.
@@ -598,14 +598,14 @@ install: [
598598
[ "true" { ?v:smtg } ]
599599
[ "false" { !?v:smtg } ]
600600
]
601-
### opam install install -vv | unordered
601+
### opam install install -vv | sed-cmd true | unordered
602602
The following actions will be performed:
603603
=== install 1 package
604604
- install install 1
605605

606606
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
607607
Processing 3/3: [install: true]
608-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "install" "true" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/install.1)
608+
true (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/install.1)
609609
-> installed install.1
610610
Done.
611611
### :III:4: runtest :::
@@ -615,14 +615,14 @@ run-test: [
615615
[ "true" { ?v:smtg } ]
616616
[ "false" { !?v:smtg } ]
617617
]
618-
### opam install runtest --with-test -vv | unordered
618+
### opam install runtest --with-test -vv | sed-cmd true | unordered
619619
The following actions will be performed:
620620
=== install 1 package
621621
- install runtest 1
622622

623623
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
624624
Processing 2/3: [runtest: true]
625-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "true" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/runtest.1)
625+
true (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/build/runtest.1)
626626
-> compiled runtest.1
627627
-> installed runtest.1
628628
Done.
@@ -641,14 +641,14 @@ The following actions will be performed:
641641
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
642642
-> installed remove.1
643643
Done.
644-
### opam remove remove -vv | unordered
644+
### opam remove remove -vv | sed-cmd true | unordered
645645
The following actions will be performed:
646646
=== remove 1 package
647647
- remove remove 1
648648

649649
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
650650
Processing 2/2: [remove: true]
651-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "remove" "true" (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/remove/remove.1)
651+
true (CWD=${BASEDIR}/OPAM/package-variable/.opam-switch/remove/remove.1)
652652
-> removed remove.1
653653
Done.
654654
### :III:6: depends :::
@@ -798,7 +798,7 @@ build: [
798798
### <pkg:patches.1:patches.config>
799799
opam-version: "2.0"
800800
variables { smtg: "something" }
801-
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | unordered
801+
### opam install patches -vv | 'patch-[^"]+' -> 'patch' | sed-cmd grep | unordered
802802
The following actions will be performed:
803803
=== install 1 package
804804
- install patches 1
@@ -821,7 +821,7 @@ Processing 2/3: [patches: patch]
821821
+ /usr/bin/patch "-p1" "-i" "${BASEDIR}/OPAM/log/processed-patch" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/patches.1)
822822
- patching file some-content
823823
Processing 2/3: [patches: grep ploplop]
824-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "grep" "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/patches.1)
824+
grep "ploplop" "some-content" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/patches.1)
825825
# Return code 31 #
826826
### :IV:2: build :::
827827
### <pkg:build.1>
@@ -833,14 +833,14 @@ build: [
833833
### <pkg:build.1:build.config>
834834
opam-version: "2.0"
835835
variables { smtg: "something" }
836-
### opam install build -vv | unordered
836+
### opam install build -vv | sed-cmd false | unordered
837837
The following actions will be performed:
838838
=== install 1 package
839839
- install build 1
840840

841841
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
842842
Processing 2/3: [build: false]
843-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "false" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/build.1)
843+
false (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/build.1)
844844
[ERROR] The compilation of build.1 failed at "false".
845845

846846

@@ -863,14 +863,14 @@ install: [
863863
### <pkg:install.1:install.config>
864864
opam-version: "2.0"
865865
variables { smtg: "something" }
866-
### opam install install -vv | unordered
866+
### opam install install -vv | sed-cmd false | unordered
867867
The following actions will be performed:
868868
=== install 1 package
869869
- install install 1
870870

871871
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
872872
Processing 3/3: [install: false]
873-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "install" "false" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/install.1)
873+
false (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/install.1)
874874
[ERROR] The installation of install failed at "false".
875875

876876

@@ -893,14 +893,14 @@ run-test: [
893893
### <pkg:runtest.1:runtest.config>
894894
opam-version: "2.0"
895895
variables { smtg: "something" }
896-
### opam install runtest --with-test -vv | unordered
896+
### opam install runtest --with-test -vv | sed-cmd false | unordered
897897
The following actions will be performed:
898898
=== install 1 package
899899
- install runtest 1
900900

901901
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
902902
Processing 2/3: [runtest: false]
903-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "build" "false" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/runtest.1)
903+
false (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/build/runtest.1)
904904
[ERROR] The compilation of runtest.1 failed at "false".
905905

906906

@@ -931,14 +931,14 @@ The following actions will be performed:
931931
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
932932
-> installed remove.1
933933
Done.
934-
### opam remove remove -vv | unordered
934+
### opam remove remove -vv | sed-cmd true | unordered
935935
The following actions will be performed:
936936
=== remove 1 package
937937
- remove remove 1
938938

939939
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
940940
Processing 2/2: [remove: true]
941-
+ ${BASEDIR}/OPAM/opam-init/hooks/sandbox.sh "remove" "true" (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/remove/remove.1)
941+
true (CWD=${BASEDIR}/OPAM/self-package-variable/.opam-switch/remove/remove.1)
942942
-> removed remove.1
943943
Done.
944944
### :IV:6: depends :::

0 commit comments

Comments
 (0)