Skip to content

Commit c36dd1c

Browse files
rjbourjbou
authored
Merge pull request #6671 from rjbou/clean-tests
reftests: Clean some tests
2 parents ce74b40 + ecb3119 commit c36dd1c

15 files changed

+127
-93
lines changed

‎master_changes.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ 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]
122+
* Update/homogenise escaping `BASEDIR` using `printf` [#6671 @rjbou]
123+
* Homogenise here document usage [#6671 @rjbou]
121124

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

‎tests/reftests/action-disk.test‎

Lines changed: 21 additions & 21 deletions
Large diffs are not rendered by default.

‎tests/reftests/admin-cache.test‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ for n in $@; do
3535
nv=$n.1
3636
arch=arch-$n.tgz
3737
file="packages/$n/$nv/opam"
38-
echo "url {" >> $file
39-
echo "src: \"$arch\"" >> $file
4038
MD5=$(openssl md5 $arch | cut -d' ' -f2)
41-
echo "checksum: \"md5=$MD5\"" >> $file
42-
echo "}" >> $file
39+
cat >> "$file" << EOF
40+
url {
41+
src: "$arch"
42+
checksum: "md5=$MD5"
43+
}
44+
EOF
4345
done
4446
### sh add-urls.sh ipsum dolor sit amet
4547
### opam admin add-hashes sha256

‎tests/reftests/admin.test‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,13 +564,18 @@ shift
564564
for p in $@; do
565565
p=$p.1
566566
file="packages/${p%.*}/$p/opam"
567-
echo "url {" >> $file
568-
echo "src: \"$arch.tgz\"" >> $file
569567
if [ $hsh -eq 1 ] ; then
570568
MD5=$(openssl md5 $arch.tgz | cut -d' ' -f2)
571-
echo "checksum: \"md5=$MD5\"" >> $file
569+
checksum="checksum: \"md5=$MD5\""
570+
else
571+
checksum=""
572572
fi
573-
echo "}" >> $file
573+
cat >> "$file" << EOF
574+
url {
575+
src: "$arch.tgz"
576+
$checksum
577+
}
578+
EOF
574579
done
575580
### <check-hash-ca.sh>
576581
hc=$OPAMROOT/download-cache/hash-cache

‎tests/reftests/download.test‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,15 @@ 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"`
169-
url="$basedir/arch.tgz"
170-
echo "url {" >> "$file"
171-
echo "src:\"$url\"" >> "$file"
172-
MD5=$(openssl md5 "$url" | cut -d' ' -f2)
173-
echo "checksum: \"md5=$MD5\"" >> "$file"
174-
echo "}" >> "$file"
168+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
169+
arch=arch.tgz
170+
MD5=$(openssl md5 "$arch" | cut -d' ' -f2)
171+
cat >> "$file" << EOF
172+
url {
173+
src:"$arch"
174+
checksum: "md5=$MD5"
175+
}
176+
EOF
175177
### sh mkurl.sh
176178
### opam update
177179

@@ -213,10 +215,12 @@ content
213215
opam-version: "2.0"
214216
### <mkurl.sh>
215217
file="REPO/packages/bar/bar.1/opam"
216-
basedir=`echo "$BASEDIR" | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
217-
echo "url {" >> "$file"
218-
echo "src:\"git+file://$basedir/bar\"" >> "$file"
219-
echo "}" >> "$file"
218+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
219+
cat >> "$file" << EOF
220+
url {
221+
src:"git+file://$basedir/bar"
222+
}
223+
EOF
220224
### sh mkurl.sh
221225
### opam update
222226

‎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: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ 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"
15-
echo "url {" >> $file
16-
echo "src:\"$url\"" >> $file
1715
MD5=$(openssl md5 $url | cut -d' ' -f2)
18-
echo "checksum: \"md5=$MD5\"" >> $file
19-
echo "}" >> $file
16+
cat >> "$file" << EOF
17+
url {
18+
src:"$url"
19+
checksum: "md5=$MD5"
20+
}
21+
EOF
2022
### sh mkurl.sh source-orig
2123
### opam update
2224

@@ -55,13 +57,15 @@ opam-version: "2.0"
5557
install: [ "test" "-f" "i-am-extra-source" ]
5658
### <mkxsrc.sh>
5759
file="REPO/packages/b/b.1/opam"
58-
basedir=`echo $BASEDIR | sed "s/\\\\\\\\/\\\\\\\\\\\\\\\\/g"`
60+
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
5961
xsrc="$basedir/other-sources/$1"
60-
echo "extra-source \"i-am-extra-source\" {" >> $file
61-
echo "src: \"$xsrc\"" >> $file
6262
MD5=$(openssl md5 $xsrc | cut -d' ' -f2)
63-
echo "checksum: \"md5=$MD5\"" >> $file
64-
echo "}" >> $file
63+
cat >> "$file" << EOF
64+
extra-source "i-am-extra-source" {
65+
src: "$xsrc"
66+
checksum: "md5=$MD5"
67+
}
68+
EOF
6569
### sh mkxsrc.sh original
6670
### opam update
6771

0 commit comments

Comments
 (0)