From nobody Thu Dec 18 17:55:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583935295; cv=none; d=zohomail.com; s=zohoarc; b=IcVfZpPy3FCUV3UaEhKBDIkIREX87J0Liy/1jNBTBnHJqCYSXKHZNzJFxwj9y2aP/OaxzxRVKjZ3RzM7Mp3FYQpC/GfKGzXPLNiR2gXPNP+NIfCm1wFfU0OwtiNB+t7jioYAEoPHkcg6cnQWNLUu2SZjRQ7Ev3KVCxN6fcSdFHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583935295; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ceh+Z/k4QlcB7087W8AF6D0vfoTIvyOWKzKEzJMnX04=; b=O+KqS+LGrpSL8DRmERVy12TMnZqX3hH08eoFB57UAOpVuvS8ayguS6FlpTJHnjSMM0XBf+2CB/+W36O0tM8zQWOS/V9T5hM4g9UsJsMyp4S4bACnEGdq51i92V5/1++vYOQNL2N0IMfT/9MCxRlq2mxdUfKBVzxuzOtVEvPdPd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583935295685549.0121653088303; Wed, 11 Mar 2020 07:01:35 -0700 (PDT) Received: from localhost ([::1]:52672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC1vQ-0005u0-TS for importer@patchew.org; Wed, 11 Mar 2020 10:01:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36260) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jC1n0-0004Aw-Tm for qemu-devel@nongnu.org; Wed, 11 Mar 2020 09:52:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jC1mz-0002ch-Ik for qemu-devel@nongnu.org; Wed, 11 Mar 2020 09:52:50 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:22498 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 1jC1mz-0002b5-Cu for qemu-devel@nongnu.org; Wed, 11 Mar 2020 09:52:49 -0400 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-39-g55f5o1KMN-zgKSf-0vjLw-1; Wed, 11 Mar 2020 09:52:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85F15800EBC; Wed, 11 Mar 2020 13:52:36 +0000 (UTC) Received: from localhost (ovpn-117-216.ams2.redhat.com [10.36.117.216]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00CC75C13D; Wed, 11 Mar 2020 13:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583934759; 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: in-reply-to:in-reply-to:references:references; bh=ceh+Z/k4QlcB7087W8AF6D0vfoTIvyOWKzKEzJMnX04=; b=QPEt5lwZNIduuj8Dl8bCWbpZjvM2R1oktg8f5gJD4QbPwF8thHrm51Of0wBkfq9pYElrhi sH7WkZ4yGFC0ipfHsj1AyhR0SAK/lS1iEthIbu75SrLSjGXxWnOoYnOdjhUbT9QDp7ahQf 2CxirmjkZgMbVMAbqo0YlNKTX2I/fLM= X-MC-Unique: g55f5o1KMN-zgKSf-0vjLw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 07/19] iotests: Fix nonportable use of od --endian Date: Wed, 11 Mar 2020 14:52:01 +0100 Message-Id: <20200311135213.1242028-8-mreitz@redhat.com> In-Reply-To: <20200311135213.1242028-1-mreitz@redhat.com> References: <20200311135213.1242028-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Eric Blake 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 Reviewed-by: Max Reitz Message-Id: <20200226125424.481840-1-eblake@redhat.com> Signed-off-by: Max Reitz --- 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 8a6366c09d..4c246c0450 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -56,18 +56,30 @@ 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 byte + + # coreutils' od --endian is not portable, so manually assemble bytes. + for byte in $(od -j"$2" -N"$3" -An -v -tu1 "$1"); do + val=3D$(( val | (byte << shift) )) + shift=3D$((shift + 8)) + done + printf %llu $val } =20 # 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 byte + + # coreutils' od --endian is not portable, so manually assemble bytes. + for byte in $(od -j"$2" -N"$3" -An -v -tu1 "$1"); do + val=3D$(( (val << 8) | byte )) + done + printf %llu $val } =20 -# 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