Re: [PATCH] iotests: Fix nonportable use of od --endian

[Eric Blake]

On 2/19/20 8:41 AM, Eric Blake wrote:
> 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 <address@hidden>
> Signed-off-by: Eric Blake <address@hidden>
> ---
>   tests/qemu-iotests/common.rc | 22 +++++++++++++++++-----
>   1 file changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 8a6366c09daf..b77ef3d22cd1 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -56,6 +56,12 @@ poke_file()
>   # peek_file_le 'test.img' 512 2 => 65534
>   peek_file_le()
>   {
> -    # Wrap in echo $() to strip spaces
> -    echo $(od -j"$2" -N"$3" --endian=little -An -vtu"$3" "$1")
> +    local val=0 shift=0 i
> +
> +    # coreutils' od --endian is not portable, so manually assemble bytes.
> +    for i in $(od -j"$2" -N"$3" -An -v -tu1 "$1"); do
> +        val=$(( val | (i << shift) ))
> +        shift=$((shift + 8))
> +    done
> +    echo $val

Reports large 8-byte values as negative, whereas the pre-patch version 
reported them as positive.  To preserve behavior, we should squash in:

diff --git i/tests/qemu-iotests/common.rc w/tests/qemu-iotests/common.rc
index 8966ad5cde78..a596856d4d8c 100644
--- i/tests/qemu-iotests/common.rc
+++ w/tests/qemu-iotests/common.rc
@@ -63,7 +63,7 @@ peek_file_le()
         val=$(( val | (i << shift) ))
         shift=$((shift + 8))
     done
-    echo $val
+    printf %llu $val
 }

 # peek_file_be 'test.img' 512 2 => 65279
@@ -75,7 +75,7 @@ peek_file_be()
     for i in $(od -j"$2" -N"$3" -An -v -tu1 "$1"); do
         val=$(( (val << 8) | i ))
     done
-    echo $val
+    printf %llu $val
 }

 # peek_file_raw 'test.img' 512 2 => '\xff\xfe'. Do not use if the raw data



--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org