From patchwork Wed Feb 26 07:39:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 183896 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2789463ile; Tue, 25 Feb 2020 23:43:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyCt0I2PmJGr1EJD3Jc+VSELCeDxIS6nR7I+0pk1buiaGGUIjBG7E7shWjzg6NscitbFJVf X-Received: by 2002:ad4:490d:: with SMTP id bh13mr3755215qvb.180.1582703006810; Tue, 25 Feb 2020 23:43:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582703006; cv=none; d=google.com; s=arc-20160816; b=uXMQNN4RFWI1eyVpGqI2stnkDYZZvaxYvaP2Nd7h/2VIubpOfS9fYSdmIr2MSx55PS BnBmKyyzCRUygBp/xQpyFBSy1DWqBEr1LKa/DmW2BKnHu1w3303GVmdzOi2WPv9zEEIB KuR8bK5fu7JSIyo+4mlx1ka8ZfZdeiEymJNABgQClLui6yExRPuX6ne5SywB0/4uAC1D keUpxUsDPWwSnNMYQ8+YzzyrZCwn1lTmP1ZTM82MNRYUqw3Ot+6SQYYsq8QhQWqryvmM o9hv79uYmapLz5C/nM+BRLhfy+XHykROpina0UF32jp22SRDnjg6LQeCTlTy96vGlaJo MHQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=I5SVyZLmK4mKEgyCR0TafKDKBPyJxm72cVAZ/22L6J0=; b=pW5n2Y/xiV6XITGGGvsbC6e7hq+yML25On6Vxc/EQRpi9ugZ2dnjvxWXRL3fDuoRXI HEV28wzaXz1bZsiho+C90foZQ5nu5fOQDZLdUX+e44wJNfHSv89f6tux22VnMxf6gCRq /vVyZK/08JkRlu6uYh9LBtarL07t8q2E641uNx9X6/u6Trxzv1gkiIz2VWJcFMpl2G6T va4h7HX/HU9gYgsaix9B43ZYTKbWZN0BMqvChGXWfPOtLJ0Sq8WNQL7vQ4fohsHhVi/u 5mm6mdLANUYi5qnkNfwqoQ3+9s22UeXDZz1eGxw4c0bSeKnzbFbbVMnGaM3KvZc6D5nj EhCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bDlR7Yvx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z45si740280qtb.37.2020.02.25.23.43.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Feb 2020 23:43:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bDlR7Yvx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rLq-0007KB-9o for patch@linaro.org; Wed, 26 Feb 2020 02:43:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46134) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6rIH-0000iD-80 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6rIG-0002ih-5e for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:45 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6rIF-0002gr-V8 for qemu-devel@nongnu.org; Wed, 26 Feb 2020 02:39:44 -0500 Received: by mail-wm1-x334.google.com with SMTP id z12so1786401wmi.4 for ; Tue, 25 Feb 2020 23:39:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I5SVyZLmK4mKEgyCR0TafKDKBPyJxm72cVAZ/22L6J0=; b=bDlR7YvxGsvJMSf7oTX1D7QQi0TIF2iihLHiST4iwwdE+qjWop88yJRgCt1IQaPuvI JW62Q4nNdu6Y4G1RWFXySlk8MX+Cbdv3WR0iTeWuiJkewo5owHCbwwuQkZCkJMAWTYjl y6glFdroYmGsqNo28XgDo1z87OrHdO4g0L2tMoOXXTpLVVTAXqtWDFKgW1mocbHecf7q xos89dsCnwlZ3QCu+9M0GG/1qrtc184JtCEdhWOqhsK+ia39VDoV8wwBxbmUaFlzYw0E gW1KrKNJ59Kh6oWcbQ+vqJi7PISUWCrSctVg4SbkfBg83xTcm8KSw/4Mbp51HcaFl/37 XjHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I5SVyZLmK4mKEgyCR0TafKDKBPyJxm72cVAZ/22L6J0=; b=jKCQvZe0BDGmSdSh0rYe6AvC/JWrT1uCax8IXTiElmPQ/F4R0BRmARqoj4fbkYEOyX V+QP/pnoAfkF+6ABuC6l73zY4xPAkcLPlbhEqpXuvFqTELJO7M5rNuHZz+/9bToNwQ+O ABka7bRbfjmQbYlZ6OIsKdqQs9Pmm+iAniLHBNTFJzlkGfVmJgfne8aZIwVzr3K6zct/ Sx14fjDOSQ4NvHZS7SLZx5n+AMCkWD3PkbckcPcf1kzk6++LxGW+OiJSGG8tLvTXnMie VAHIqT4PhuJeR8WL0hGlBQ7cqtaQtWbd0I3lRhGDB8M0vzTA2ROeFGOMImMnae3dxfN6 3OzQ== X-Gm-Message-State: APjAAAXaf7fP3CXG4F4aI9SGJ46oaCM1/gCzjR1MRaCJebk5cDrmOz5B NIrX/DaVlKHpb7Glh3AfIOLTRA== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr3776989wma.87.1582702782893; Tue, 25 Feb 2020 23:39:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p12sm2092249wrx.10.2020.02.25.23.39.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 23:39:36 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF6321FF98; Wed, 26 Feb 2020 07:39:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/19] tests/iotests: be a little more forgiving on the size test Date: Wed, 26 Feb 2020 07:39:18 +0000 Message-Id: <20200226073929.28237-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226073929.28237-1-alex.bennee@linaro.org> References: <20200226073929.28237-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 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 , Robert Foley , "open list:Block layer core" , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Max Reitz , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At least on ZFS this was failing as 512 was less than or equal to 512. I suspect the reason is additional compression done by ZFS and however qemu-img gets the actual size. Loosen the criteria to make sure after is not bigger than before and also dump the values in the report. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Reviewed-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200225124710.14152-9-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index 3500e0c47a2..af677d90b86 100755 --- a/tests/qemu-iotests/214 +++ b/tests/qemu-iotests/214 @@ -125,9 +125,9 @@ $QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\ sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" | sed -n '/"actual-size":/ s/[^0-9]//gp') -if [ $sizeA -le $sizeB ] +if [ $sizeA -lt $sizeB ] then - echo "Compression ERROR" + echo "Compression ERROR ($sizeA < $sizeB)" fi $QEMU_IMG check --output=json "$TEST_IMG" |