Skip to content

Commit dd8e327

Browse files
committed
reftest: replace long sed with simple printf for basedir escaping
1 parent 582f3a2 commit dd8e327

File tree

11 files changed

+17
-16
lines changed

11 files changed

+17
-16
lines changed

master_changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ users)
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]
121121
* Remove `getconf` filtering [#6671 @rjbou]
122+
* Update/homogenise escaping `BASEDIR` using `printf` [#6671 @rjbou]
122123

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

tests/reftests/download.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Clearing cache of downloaded files
165165
opam-version: "2.0"
166166
### <mkurl.sh>
167167
file="REPO/packages/foo/foo.1/opam"
168-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
168+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
169169
url="$basedir/arch.tgz"
170170
echo "url {" >> "$file"
171171
echo "src:\"$url\"" >> "$file"
@@ -213,7 +213,7 @@ content
213213
opam-version: "2.0"
214214
### <mkurl.sh>
215215
file="REPO/packages/bar/bar.1/opam"
216-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
216+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
217217
echo "url {" >> "$file"
218218
echo "src:\"git+file://$basedir/bar\"" >> "$file"
219219
echo "}" >> "$file"

tests/reftests/fetch-package.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ install: [
3636
p=foo-arch.1
3737
arch=arch
3838
file="REPO/packages/${p%.*}/$p/opam"
39-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
39+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
4040
MD5=$(openssl md5 "$arch.tgz" | cut -d' ' -f2)
4141
cat << EOF >> "$file"
4242
url {

tests/reftests/lint.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ license: "ISC"
903903
dev-repo: "hg+https://[email protected]"
904904
bug-reports: "https://nobug"
905905
### <add-url.sh>
906-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
906+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
907907
cat << EOF >> lint.opam
908908
url { src:"file://$basedir/an-archive" }
909909
EOF
@@ -924,7 +924,7 @@ license: "ISC"
924924
dev-repo: "hg+https://[email protected]"
925925
bug-reports: "https://nobug"
926926
### <add-url.sh>
927-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
927+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
928928
cat << EOF >> lint.opam
929929
url {
930930
src:"file://$basedir/an-archive.tgz"

tests/reftests/pin-legacy.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ opam-version: "2.0"
8989
depends: "qux"
9090
depexts: [ "inexistant" ]
9191
### <add_pin_depends.sh>
92-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
92+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
9393
echo "pin-depends: [ \"qux.dev\" \"file://$basedir/qux\" ]" >> bar/bar.opam
9494
### sh add_pin_depends.sh
9595
### <pin:qux/qux.opam>

tests/reftests/pin.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ EOF
6161
tar czf "$nv.tgz" "$nv.t"
6262
MD5=$(openssl md5 "$nv.tgz" | cut -d' ' -f2)
6363
XMD5=$(openssl md5 "$pre/files/$n.install" | cut -d' ' -f2)
64-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/g"`
64+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
6565
cat << EOF > "$pre/opam"
6666
opam-version:"2.0"
6767
build: [ "test" "-f" "%{name}%.%{version}%.t" ]
@@ -1351,7 +1351,7 @@ src: "file://${BASEDIR}/over-epr"
13511351
### <pin-depends.sh>
13521352
#!/bin/sh
13531353
set -eu
1354-
basedir=$(echo "$BASEDIR" | sed 's/\\/\\\\\\\\/g')
1354+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
13551355
cat << EOF >> "$1"
13561356
pin-depends: [
13571357
["$2" "file://$basedir/$3"]

tests/reftests/rebuild.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ opam-version: "2.0"
1010
build: [ "test" "-f" "something" ]
1111
### <mkurl.sh>
1212
file="REPO/packages/a/a.1/opam"
13-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
13+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
1414
url="$basedir/$1.tgz"
1515
echo "url {" >> $file
1616
echo "src:\"$url\"" >> $file
@@ -55,7 +55,7 @@ opam-version: "2.0"
5555
install: [ "test" "-f" "i-am-extra-source" ]
5656
### <mkxsrc.sh>
5757
file="REPO/packages/b/b.1/opam"
58-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
58+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
5959
xsrc="$basedir/other-sources/$1"
6060
echo "extra-source \"i-am-extra-source\" {" >> $file
6161
echo "src: \"$xsrc\"" >> $file

tests/reftests/source.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo "src: \"$arch.tgz\"" >> $file
1919
MD5=$(openssl md5 $arch.tgz | cut -d' ' -f2)
2020
echo "checksum: \"md5=$MD5\"" >> $file
2121
echo "}" >> $file
22-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
22+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
2323
echo "dev-repo: \"git+file://${basedir}/pandev\"" >> $file
2424
### sh mkurl.sh
2525
### opam update
@@ -118,7 +118,7 @@ opam-version: "2.0"
118118
### <mkurl.sh>
119119
p=pandore.4
120120
file="REPO/packages/${p%.*}/$p/opam"
121-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
121+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
122122
echo "url {" >> $file
123123
echo "git: \"$basedir/pandev\"" >> $file
124124
echo "}" >> $file

tests/reftests/sources-directory-cleaning.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ echo "src: \"$arch\"" >> "$file"
1818
MD5=$(openssl md5 "$arch" | cut -d' ' -f2)
1919
echo "checksum: \"md5=$MD5\"" >> "$file"
2020
echo "}" >> "$file"
21-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
21+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
2222
echo "dev-repo: \"file://${basedir}/$n\"" >> "$file"
2323
### sh mkurl.sh
2424
### <pkg:waste-local.1>
@@ -27,7 +27,7 @@ opam-version: "2.0"
2727
n=waste-local
2828
v=1
2929
file="REPO/packages/$n/$n.$v/opam"
30-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
30+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
3131
echo "url { local: \"file://${basedir}/waste\" }" >> "$file"
3232
### sh mkurl.sh
3333
### opam update

tests/reftests/switch-import.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ install: ["cp" "snd.out" "%{lib}%"]
8080
dev-repo: "hg+https://[email protected]"
8181
url {
8282
### <add-hash.sh>
83-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
83+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
8484
echo "src: \"git+file://${basedir}/nip#snd-head\"}}" >> twice.snd.xp
8585
### sh add-hash.sh
8686
### opam switch import twice.snd.xp

0 commit comments

Comments
 (0)