From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79D82C34047 for ; Wed, 19 Feb 2020 14:41:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4540124670 for ; Wed, 19 Feb 2020 14:41:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="freBB3zG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4540124670 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4QXz-0004T9-G4 for qemu-devel@archiver.kernel.org; Wed, 19 Feb 2020 09:41:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51500) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4QXK-0003qr-5d for qemu-devel@nongnu.org; Wed, 19 Feb 2020 09:41:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4QXJ-0004sC-5h for qemu-devel@nongnu.org; Wed, 19 Feb 2020 09:41:14 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23575 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4QXJ-0004oG-1s for qemu-devel@nongnu.org; Wed, 19 Feb 2020 09:41:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582123271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TNZGMq3v5Sfpze0h3lmh7dsr8i5R1MRQMTFOSQ6ZVi0=; b=freBB3zGPvrWjJ+PBEjBIk5KnVrVeCJAWVznxqtZCQ8CGMIKwZG68dvyVuMFkCKXurRE8L bflnXA5S1O0WhuNk6lDdi+reKLsj+X9uwSdmMqFgOPCOAsm+UwGyG0UB3uhH0tB69PD67Z VDMeSmw9TBWYP1uQudfnO+ZIgJ1IPRc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-424-maQGhvMLPd-xKWrrTBRPbQ-1; Wed, 19 Feb 2020 09:41:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C046C1088386; Wed, 19 Feb 2020 14:41:05 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-180.phx2.redhat.com [10.3.116.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27FDF60C84; Wed, 19 Feb 2020 14:41:05 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Subject: [PATCH] iotests: Fix nonportable use of od --endian Date: Wed, 19 Feb 2020 08:41:03 -0600 Message-Id: <20200219144103.2919292-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: maQGhvMLPd-xKWrrTBRPbQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, andrey.shinkevich@virtuozzo.com, Kevin Wolf , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Eric Blake --- 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 =3D> 65534 peek_file_le() { - # Wrap in echo $() to strip spaces - echo $(od -j"$2" -N"$3" --endian=3Dlittle -An -vtu"$3" "$1") + local val=3D0 shift=3D0 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=3D$(( val | (i << shift) )) + shift=3D$((shift + 8)) + done + echo $val } # peek_file_be 'test.img' 512 2 =3D> 65279 peek_file_be() { - # Wrap in echo $() to strip spaces - echo $(od -j"$2" -N"$3" --endian=3Dbig -An -vtu"$3" "$1") + local val=3D0 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=3D$(( (val << 8) | i )) + done + echo $val } -# peek_file_raw 'test.img' 512 2 =3D> '\xff\xfe' +# peek_file_raw 'test.img' 512 2 =3D> '\xff\xfe'. Do not use if the raw da= ta +# is likely to contain \0 or trailing \n. peek_file_raw() { dd if=3D"$1" bs=3D1 skip=3D"$2" count=3D"$3" status=3Dnone --=20 2.24.1