Skip to content

Commit ecb3119

Browse files
rjboukit-ty-kate
rjbou
authored and
kit-ty-kate
committed
reftest: replace multiple echoes with here doc
1 parent dd8e327 commit ecb3119

File tree

8 files changed

+89
-57
lines changed

8 files changed

+89
-57
lines changed

‎master_changes.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ users)
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]
122122
* Update/homogenise escaping `BASEDIR` using `printf` [#6671 @rjbou]
123+
* Homogenise here document usage [#6671 @rjbou]
123124

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

‎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: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,14 @@ opam-version: "2.0"
166166
### <mkurl.sh>
167167
file="REPO/packages/foo/foo.1/opam"
168168
basedir=$(printf '%s' "$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"
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

@@ -214,9 +216,11 @@ opam-version: "2.0"
214216
### <mkurl.sh>
215217
file="REPO/packages/bar/bar.1/opam"
216218
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
217-
echo "url {" >> "$file"
218-
echo "src:\"git+file://$basedir/bar\"" >> "$file"
219-
echo "}" >> "$file"
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/rebuild.test‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ build: [ "test" "-f" "something" ]
1212
file="REPO/packages/a/a.1/opam"
1313
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

@@ -57,11 +59,13 @@ install: [ "test" "-f" "i-am-extra-source" ]
5759
file="REPO/packages/b/b.1/opam"
5860
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

‎tests/reftests/shared-fetch.test‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@ arch=$1
2424
shift
2525
for p in $@; do
2626
file="REPO/packages/${p%.*}/$p/opam"
27-
echo "url {" >> $file
28-
echo "src: \"$arch.tgz\"" >> $file
2927
MD5=$(openssl md5 $arch.tgz | cut -d' ' -f2)
30-
echo "checksum: \"md5=$MD5\"" >> $file
31-
echo "}" >> $file
28+
cat >> "$file" << EOF
29+
url {
30+
src: "$arch.tgz"
31+
checksum: "md5=$MD5"
32+
}
33+
EOF
3234
done
3335
### sh mkurl.sh shared no-extra.3 extra.3
3436
### sh mkurl.sh non-shared non-shared.4
@@ -85,11 +87,13 @@ src=$1
8587
shift
8688
for p in $@; do
8789
file="REPO/packages/${p%.*}/$p/opam"
88-
echo "extra-source \"$src\" {" >> $file
89-
echo "src: \"extra/$src\"" >> $file
9090
MD5=$(openssl md5 extra/$src | cut -d' ' -f2)
91-
echo "checksum: \"md5=$MD5\"" >> $file
92-
echo "}" >> $file
91+
cat >> "$file" << EOF
92+
extra-source "$src" {
93+
src: "extra/$src"
94+
checksum: "md5=$MD5"
95+
}
96+
EOF
9397
done
9498
### sh mkextrasource.sh extra_source.ml extra.3 no-extra.3
9599
### opam update
@@ -169,15 +173,19 @@ arch=shared
169173
pkg=$1
170174
shift
171175
file="REPO/packages/${pkg%.*}/$pkg/opam"
172-
echo "url {" >> $file
173-
echo "src: \"$arch.tgz\"" >> $file
174-
echo "checksum: [" >> $file
176+
cat >> "$file" << EOF
177+
url {
178+
src: "$arch.tgz"
179+
checksum: [
180+
EOF
175181
for h in $@; do
176182
HASH=$(openssl $h $arch.tgz | cut -d' ' -f2)
177183
echo "\"$h=$HASH\"" >> $file
178184
done
179-
echo " ]" >> $file
180-
echo "}" >> $file
185+
cat >> "$file" << EOF
186+
]
187+
}
188+
EOF
181189
### sh mkurl.sh extra.3 md5 sha512
182190
### sh mkurl.sh no-extra.3 sha256 sha512
183191
### sh mkurl.sh intra.3 sha512
@@ -239,11 +247,13 @@ depends: [ "no-extra" ]
239247
p=extra.3
240248
arch=shared
241249
file="REPO/packages/${p%.*}/$p/opam"
242-
echo "url {" >> $file
243-
echo "src: \"$arch.tgz\"" >> $file
244250
MD5="01234567890123456789012345678901"
245-
echo "checksum: \"md5=$MD5\"" >> $file
246-
echo "}" >> $file
251+
cat >> "$file" << EOF
252+
url {
253+
src: "$arch.tgz"
254+
checksum: "md5=$MD5"
255+
}
256+
EOF
247257
### sh mkurl.sh
248258
### opam update
249259

‎tests/reftests/source.test‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ opam-version: "2.0"
1414
p=pandore.3
1515
arch=origin
1616
file="REPO/packages/${p%.*}/$p/opam"
17-
echo "url {" >> $file
18-
echo "src: \"$arch.tgz\"" >> $file
1917
MD5=$(openssl md5 $arch.tgz | cut -d' ' -f2)
20-
echo "checksum: \"md5=$MD5\"" >> $file
21-
echo "}" >> $file
2218
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
23-
echo "dev-repo: \"git+file://${basedir}/pandev\"" >> $file
19+
cat >> "$file" << EOF
20+
url {
21+
src: "$arch.tgz"
22+
checksum: "md5=$MD5"
23+
}
24+
dev-repo: "git+file://${basedir}/pandev"
25+
EOF
2426
### sh mkurl.sh
2527
### opam update
2628

@@ -119,10 +121,12 @@ opam-version: "2.0"
119121
p=pandore.4
120122
file="REPO/packages/${p%.*}/$p/opam"
121123
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
122-
echo "url {" >> $file
123-
echo "git: \"$basedir/pandev\"" >> $file
124-
echo "}" >> $file
125-
echo "dev-repo: \"git+file://${basedir}/pandev\"" >> $file
124+
cat >> "$file" << EOF
125+
url {
126+
git: "$basedir/pandev"
127+
}
128+
dev-repo: "git+file://${basedir}/pandev"
129+
EOF
126130
### sh mkurl.sh
127131
### opam update
128132

‎tests/reftests/sources-directory-cleaning.test‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ n=waste
1313
v=1
1414
arch=waste.tgz
1515
file="REPO/packages/$n/$n.$v/opam"
16-
echo "url {" >> "$file"
17-
echo "src: \"$arch\"" >> "$file"
18-
MD5=$(openssl md5 "$arch" | cut -d' ' -f2)
19-
echo "checksum: \"md5=$MD5\"" >> "$file"
20-
echo "}" >> "$file"
2116
basedir=$(printf '%s' "$BASEDIR" | sed 's/\\/\\\\/g')
22-
echo "dev-repo: \"file://${basedir}/$n\"" >> "$file"
17+
MD5=$(openssl md5 "$arch" | cut -d' ' -f2)
18+
cat >> "$file" << EOF
19+
url {
20+
src: "$arch"
21+
checksum: "md5=$MD5"
22+
}
23+
dev-repo: "file://${basedir}/$n"
24+
EOF
2325
### sh mkurl.sh
2426
### <pkg:waste-local.1>
2527
opam-version: "2.0"

0 commit comments

Comments
 (0)