iotests: Fix nonportable use of od --endian
Tests 261 and 272 fail on RHEL 7 with coreutils 8.22, since od
--endian was not added until coreutils 8.23. Fix this by manually
constructing the final value one byte at a time.
Fixes: fc8ba423
Reported-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200226125424.481840-1-eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
69032253c3
commit
69135eb30b
|
@ -56,18 +56,30 @@ poke_file()
|
||||||
# peek_file_le 'test.img' 512 2 => 65534
|
# peek_file_le 'test.img' 512 2 => 65534
|
||||||
peek_file_le()
|
peek_file_le()
|
||||||
{
|
{
|
||||||
# Wrap in echo $() to strip spaces
|
local val=0 shift=0 byte
|
||||||
echo $(od -j"$2" -N"$3" --endian=little -An -vtu"$3" "$1")
|
|
||||||
|
# coreutils' od --endian is not portable, so manually assemble bytes.
|
||||||
|
for byte in $(od -j"$2" -N"$3" -An -v -tu1 "$1"); do
|
||||||
|
val=$(( val | (byte << shift) ))
|
||||||
|
shift=$((shift + 8))
|
||||||
|
done
|
||||||
|
printf %llu $val
|
||||||
}
|
}
|
||||||
|
|
||||||
# peek_file_be 'test.img' 512 2 => 65279
|
# peek_file_be 'test.img' 512 2 => 65279
|
||||||
peek_file_be()
|
peek_file_be()
|
||||||
{
|
{
|
||||||
# Wrap in echo $() to strip spaces
|
local val=0 byte
|
||||||
echo $(od -j"$2" -N"$3" --endian=big -An -vtu"$3" "$1")
|
|
||||||
|
# coreutils' od --endian is not portable, so manually assemble bytes.
|
||||||
|
for byte in $(od -j"$2" -N"$3" -An -v -tu1 "$1"); do
|
||||||
|
val=$(( (val << 8) | byte ))
|
||||||
|
done
|
||||||
|
printf %llu $val
|
||||||
}
|
}
|
||||||
|
|
||||||
# peek_file_raw 'test.img' 512 2 => '\xff\xfe'
|
# peek_file_raw 'test.img' 512 2 => '\xff\xfe'. Do not use if the raw data
|
||||||
|
# is likely to contain \0 or trailing \n.
|
||||||
peek_file_raw()
|
peek_file_raw()
|
||||||
{
|
{
|
||||||
dd if="$1" bs=1 skip="$2" count="$3" status=none
|
dd if="$1" bs=1 skip="$2" count="$3" status=none
|
||||||
|
|
Loading…
Reference in a new issue