Skip to content

Commit 582f3a2

Browse files
rjbourjbou
committed
reftests: remove getconf related cleaning
1 parent ae86162 commit 582f3a2

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

‎master_changes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ users)
118118
* Add a test for shared fetch without checksum [#6627 @rjbou]
119119
* Add a test for shared fetch without checksum, and for VCS shared fetch (not handled) [#6627 @rjbou]
120120
* Add a test showing the error message when faced with an UTF-8 character in the package version [#6640 @kit-ty-kate]
121+
* Remove `getconf` filtering [#6671 @rjbou]
121122

122123
### Engine
123124
* Fix gcc < 14.3 bug on mingw i686 [#6624 @kit-ty-kate]

‎tests/reftests/action-disk.test‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (write => none)
122122
SYSTEM LOCK ${BASEDIR}/OPAM/install-from-repo/.opam-switch/lock (write => none)
123123
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
124124
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
125-
### opam install main-repo.1 | grep -v '^- ./$' | sed-cmd rsync tar cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | "md5..?${PRE_MD5}" -> md5/pre | grep -v getconf
125+
### opam install main-repo.1 | grep -v '^- ./$' | sed-cmd rsync tar cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | "md5..?${PRE_MD5}" -> md5/pre
126126
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
127127
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
128128
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -191,7 +191,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-repo/.opam-swi
191191
SYSTEM rm ${BASEDIR}/OPAM/install-from-repo/.opam-switch/backup/state-today.export
192192
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
193193
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
194-
### opam reinstall main-repo.1 | sed-cmd tar cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | grep -v getconf
194+
### opam reinstall main-repo.1 | sed-cmd tar cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash
195195
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
196196
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
197197
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -267,7 +267,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-repo/.opam-swi
267267
SYSTEM rm ${BASEDIR}/OPAM/install-from-repo/.opam-switch/backup/state-today.export
268268
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
269269
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
270-
### opam upgrade main-repo | sed-cmd tar touch mkdir cp | "${PRE_MD5}..?${MD5}" -> pre/hash | grep -v getconf | unordered
270+
### opam upgrade main-repo | sed-cmd tar touch mkdir cp | "${PRE_MD5}..?${MD5}" -> pre/hash | unordered
271271
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
272272
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
273273
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -352,7 +352,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-repo/.opam-swi
352352
SYSTEM rm ${BASEDIR}/OPAM/install-from-repo/.opam-switch/backup/state-today.export
353353
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
354354
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
355-
### opam remove main-repo | sed-cmd tar touch | "${PRE_MD5}..?${MD5}" -> pre/hash | grep -v getconf
355+
### opam remove main-repo | sed-cmd tar touch | "${PRE_MD5}..?${MD5}" -> pre/hash
356356
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
357357
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
358358
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -511,7 +511,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-path-pin-all/.
511511
SYSTEM rm ${BASEDIR}/OPAM/install-from-path-pin-all/.opam-switch/backup/state-today.export
512512
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
513513
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
514-
### opam install main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir | grep -v getconf
514+
### opam install main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir
515515
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
516516
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
517517
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -585,7 +585,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-path-pin-all/.
585585
SYSTEM rm ${BASEDIR}/OPAM/install-from-path-pin-all/.opam-switch/backup/state-today.export
586586
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
587587
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
588-
### opam reinstall main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir | grep -v getconf
588+
### opam reinstall main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir
589589
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
590590
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
591591
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -673,7 +673,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-path-pin-all/.
673673
SYSTEM rm ${BASEDIR}/OPAM/install-from-path-pin-all/.opam-switch/backup/state-today.export
674674
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
675675
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
676-
### opam remove main-ppin | grep -v '^- ./$' | sed-cmd rsync touch | grep -v getconf
676+
### opam remove main-ppin | grep -v '^- ./$' | sed-cmd rsync touch
677677
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
678678
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
679679
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -775,7 +775,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
775775
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (write => none)
776776
'${OPAM} switch create install-from-path-pin-combined--empty' failed.
777777
# Return code 5 #
778-
### opam install ./main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir | grep -v getconf
778+
### opam install ./main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir
779779
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
780780
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
781781
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -843,7 +843,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-path-pin-all/.
843843
SYSTEM rm ${BASEDIR}/OPAM/install-from-path-pin-all/.opam-switch/backup/state-today.export
844844
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
845845
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
846-
### opam reinstall ./main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir | grep -v getconf
846+
### opam reinstall ./main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir
847847
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
848848
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
849849
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -930,7 +930,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-path-pin-all/.
930930
SYSTEM rm ${BASEDIR}/OPAM/install-from-path-pin-all/.opam-switch/backup/state-today.export
931931
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
932932
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
933-
### opam unpin main-ppin -y | grep -v '^- ./$' | sed-cmd rsync touch | grep -v getconf
933+
### opam unpin main-ppin -y | grep -v '^- ./$' | sed-cmd rsync touch
934934
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
935935
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
936936
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1107,7 +1107,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-git-pin-all/.o
11071107
SYSTEM rm ${BASEDIR}/OPAM/install-from-git-pin-all/.opam-switch/backup/state-today.export
11081108
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
11091109
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1110-
### opam install main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git." | grep -v getconf
1110+
### opam install main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git."
11111111
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
11121112
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
11131113
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1187,7 +1187,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-git-pin-all/.o
11871187
SYSTEM rm ${BASEDIR}/OPAM/install-from-git-pin-all/.opam-switch/backup/state-today.export
11881188
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
11891189
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1190-
### opam reinstall main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git." | grep -v getconf
1190+
### opam reinstall main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git."
11911191
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
11921192
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
11931193
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1286,7 +1286,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-git-pin-all/.o
12861286
SYSTEM rm ${BASEDIR}/OPAM/install-from-git-pin-all/.opam-switch/backup/state-today.export
12871287
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
12881288
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1289-
### opam remove main-gpin | sed-cmd git touch | grep -v "mkdir.*\\.git." | grep -v getconf
1289+
### opam remove main-gpin | sed-cmd git touch | grep -v "mkdir.*\\.git."
12901290
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
12911291
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
12921292
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1391,7 +1391,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
13911391
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (write => none)
13921392
'${OPAM} switch create install-from-git-pin-combined--empty' failed.
13931393
# Return code 5 #
1394-
### opam install ./main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git." | grep -v "HEAD is now" | grep -v getconf
1394+
### opam install ./main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git." | grep -v "HEAD is now"
13951395
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
13961396
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
13971397
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1469,7 +1469,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-git-pin-all/.o
14691469
SYSTEM rm ${BASEDIR}/OPAM/install-from-git-pin-all/.opam-switch/backup/state-today.export
14701470
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
14711471
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1472-
### opam reinstall ./main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git." | grep -v "HEAD is now" | grep -v getconf
1472+
### opam reinstall ./main-gpin | sed-cmd git cp touch mkdir | grep -v "mkdir.*\\.git." | grep -v "HEAD is now"
14731473
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
14741474
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
14751475
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1567,7 +1567,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-git-pin-all/.o
15671567
SYSTEM rm ${BASEDIR}/OPAM/install-from-git-pin-all/.opam-switch/backup/state-today.export
15681568
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
15691569
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1570-
### opam unpin main-gpin -y | sed-cmd git touch | grep -v "mkdir.*\\.git." | grep -v "HEAD is now" | grep -v getconf
1570+
### opam unpin main-gpin -y | sed-cmd git touch | grep -v "mkdir.*\\.git." | grep -v "HEAD is now"
15711571
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
15721572
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
15731573
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1716,7 +1716,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-version-pin/.o
17161716
SYSTEM rm ${BASEDIR}/OPAM/install-from-version-pin/.opam-switch/backup/state-today.export
17171717
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
17181718
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1719-
### opam install main-repo | grep -v '^- ./$' | sed-cmd tar rsync cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | grep -v getconf
1719+
### opam install main-repo | grep -v '^- ./$' | sed-cmd tar rsync cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash
17201720
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
17211721
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
17221722
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1775,7 +1775,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-version-pin/.o
17751775
SYSTEM rm ${BASEDIR}/OPAM/install-from-version-pin/.opam-switch/backup/state-today.export
17761776
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
17771777
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1778-
### opam reinstall main-repo | grep -v '^- ./$' | sed-cmd tar rsync cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | grep -v getconf
1778+
### opam reinstall main-repo | grep -v '^- ./$' | sed-cmd tar rsync cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash
17791779
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
17801780
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
17811781
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1851,7 +1851,7 @@ SYSTEM LOCK ${BASEDIR}/OPAM/install-from-version-pin/.o
18511851
SYSTEM rm ${BASEDIR}/OPAM/install-from-version-pin/.opam-switch/backup/state-today.export
18521852
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
18531853
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
1854-
### opam remove main-repo | grep -v '^- ./$' | sed-cmd tar rsync touch | "${PRE_MD5}..?${MD5}" -> pre/hash | grep -v getconf
1854+
### opam remove main-repo | grep -v '^- ./$' | sed-cmd tar rsync touch | "${PRE_MD5}..?${MD5}" -> pre/hash
18551855
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
18561856
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
18571857
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
@@ -1945,7 +1945,7 @@ Usage: opam switch [OPTION]… [COMMAND] [ARG]…
19451945
Try 'opam switch --help' or 'opam --help' for more information.
19461946
# Return code 2 #
19471947
### :III:2: with package
1948-
### opam switch create package-switch --package main-repo | grep -v '^- ./$' | sed-cmd rsync tar cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | "md5..?${PRE_MD5}" -> md5/pre | grep -v getconf
1948+
### opam switch create package-switch --package main-repo | grep -v '^- ./$' | sed-cmd rsync tar cp touch mkdir | "${PRE_MD5}..?${MD5}" -> pre/hash | "md5..?${PRE_MD5}" -> md5/pre
19491949
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
19501950
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
19511951
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => write)
@@ -2082,7 +2082,7 @@ SYSTEM LOCK ${BASEDIR}/void/_opam/.opam-switch/lock (wr
20822082
SYSTEM LOCK ${BASEDIR}/OPAM/repo/lock (none => none)
20832083
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => none)
20842084
### :III:3: from local, with a package
2085-
### opam switch create ./main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir | grep -v getconf
2085+
### opam switch create ./main-ppin | grep -v '^- ./$' | sed-cmd rsync cp touch mkdir
20862086
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
20872087
SYSTEM LOCK ${BASEDIR}/OPAM/lock (none => read)
20882088
SYSTEM LOCK ${BASEDIR}/OPAM/config.lock (none => write)

0 commit comments

Comments
 (0)