Skip to content

Commit 8018f2f

Browse files
authored
Merge pull request #5989 from madroach/master
Avoid head -c GNUism in reftests
2 parents c12b9d0 + a360728 commit 8018f2f

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

master_changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ users)
108108
### Tests
109109
* cli versioning: untie output from current major version [#6045 @rjbou]
110110
* Set `opam-version` to 2.2 for some conflict message tests based on opam repository to stabilise their output [#6045 @rjbou]
111+
* [BUG]: head -c is not posix compliant. Use cut -b instead. [#5989 @madroach]
111112

112113
### Engine
113114

tests/reftests/legacy-git.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARCHIVE=$1; shift
1919
if [ ! -e "packages/${ARCHIVE}" ]; then ( cd packages && tar czf ${ARCHIVE} ${ARCHIVE%.tar.gz}; ) fi
2020
MD5=$(openssl md5 packages/${ARCHIVE} | cut -d' ' -f2)
2121
echo 'src: "http://dev.null" checksum: "'$MD5'"' > REPO/packages/${PKG}/url
22-
CACHEDIR=REPO/cache/md5/$(echo $MD5 |head -c2)
22+
CACHEDIR=REPO/cache/md5/$(echo $MD5 |cut -b -2)
2323
mkdir -p $CACHEDIR
2424
cp "packages/$ARCHIVE" "$CACHEDIR/$MD5"
2525
### : INIT :

tests/reftests/legacy-local.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARCHIVE=$1; shift
77
if [ ! -e "packages/${ARCHIVE}" ]; then ( cd packages && tar czf ${ARCHIVE} ${ARCHIVE%.tar.gz}; ) fi
88
MD5=$(openssl md5 packages/${ARCHIVE} | cut -d' ' -f2)
99
echo 'src: "http://dev.null" checksum: "'$MD5'"' > REPO/packages/${PKG}/url
10-
CACHEDIR=REPO/cache/md5/$(echo $MD5 |head -c2)
10+
CACHEDIR=REPO/cache/md5/$(echo $MD5 |cut -b -2)
1111
mkdir -p $CACHEDIR
1212
cp "packages/$ARCHIVE" "$CACHEDIR/$MD5"
1313
### : INIT :

0 commit comments

Comments
 (0)