From patchwork Thu Feb 13 22:50:58 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: 183440 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1081831ile; Thu, 13 Feb 2020 14:56:31 -0800 (PST) X-Google-Smtp-Source: APXvYqykwdlOFO8kYW3XK0QXI4S35c6vLJi/qsWWpuo7oL6RHZrwIJS8Cf34yJjflncQJaiNISyF X-Received: by 2002:ad4:4dc3:: with SMTP id cw3mr25612228qvb.130.1581634591737; Thu, 13 Feb 2020 14:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581634591; cv=none; d=google.com; s=arc-20160816; b=vLLCVdAL4vhbTbyDD+RCuBLWZJaqVqN9Xjaqw4REgzkZ8CeYaxVbw1ILeuoVilzslT o6XYLBhdUhYCIqvxwOC/CrWg+LlIuE+aCZjgER24+iolh1Z4YVZxVog8BX6D1bj7H4Nb 7hbsNo/Iepx/vgIfB37AVCJmX2T0mAPiIeS8Vgsf31VAxnAG50DuddqN4krjr/LJweHj IVbAx2KVunx2wPjRXXrYwG+FUCzyzkexGprMJFQMEgMGNjv61fPMAbmry8kdFu+Mp0RZ H+CQru7FNUtc7BRL6hP6KdSRLVPMFoyE0V47l+3cLk5efDEKgimii+afHMNsmrBtOvKg UvmQ== 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=qYrx6G8+J0oij9Dy1s5nRsl6vpAyTX2kML2yVNSLhuM=; b=lDeetwWLyWr6bHThzwm/zk0Ojqa4YPdDmNABrX12JsVDmfQS/Pa3Te57+t+9QgDRRc kIMvFwgGRDSG+dO3AotMDvkumIgRb6GQ5FIaX2OCUyrqbCO9z/wYqU2Fnxr1RJuW6oXs L4i1xtQbS3umTau/F6pjrLhMF4LCHw2dNYBW0trDsHw0CMwiOQsYIqk9uyfYbwgJshUx hRYFiTcXWpSJiZWxhtYJuzo3nzJcz8MxsEa76kD9/x7F0XZHjJ9yBBl1BPwTGsXnoVe+ 48bN//2qkoAtMh4JaeSEshmdnWBvFfTMUIGAM+hHTeOBL4y0hqc/K0m+7E+tFngTgNY1 3usA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=niIgQPui; 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 i16si1604360qvo.163.2020.02.13.14.56.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 14:56:31 -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=niIgQPui; 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]:60432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2NPL-0004PC-9b for patch@linaro.org; Thu, 13 Feb 2020 17:56:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39717) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2NKL-0004mo-Pd for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2NKK-0003p8-Q8 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:21 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2NKK-0003mt-G3 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 17:51:20 -0500 Received: by mail-wr1-x443.google.com with SMTP id z7so8724211wrl.13 for ; Thu, 13 Feb 2020 14:51:20 -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=qYrx6G8+J0oij9Dy1s5nRsl6vpAyTX2kML2yVNSLhuM=; b=niIgQPui7NAxYOQJiLcjx7TnRxkZpFyCqQatN0LoVfQCb0MXPj5C3YJByjCx0lgyJI 6dZ4BbSXewrPQ3uAsO893PsPfc9Vtk04CH9lkeXHwEyZT2RFt9FTpVJvzVijqywQrQD+ xrJ015peFr1YdP2X32vb4o9SfxMiJSCkN+u4rN5UXmNBiJaufPv+nwwnOv4wbzNAxJUj WhQNAfzaEcFK+DZqW7DP4YwvcP4TcoR+LEhJODph0UFBm2j/L8JpmqOII7YttIiflYiK lLiLB4Fh7h/2QQhw+anvB6HIm0HSSBo4bJlGdUxPTMEx0SmAA7BW4CnDa3tIQH6ebZzi FXvg== 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=qYrx6G8+J0oij9Dy1s5nRsl6vpAyTX2kML2yVNSLhuM=; b=bl1XijWVXsixl5UfI26xGowKs5Z5tYexLvJWQ0qc1VkUgpMztJ/KI6+nYLqJqbN/WA qQKx5i2+kQfbANtUCYnZR9ou8DDfqnWfe0juSXUnAEzeYUXomqQPuJ6PtfV7RnsWTWwd 8gSm3M46aTiteSQxvQGPBDcHEwtfvcwDRnJWma2GSL5WzbYY2ImwIgk3VcerTZfzYcfo eFWCKZamNCys2Nr4bZFOoyTgM1fitvAFnmyVEkYONQ5MvBp72ao0VK5TokHCAlKAj5VM mtEyP55A2bVleFPXBERiR0vq4m7P5qCA8mEtHwCLjIPk52Zdp/z+Q8li/nFFy1zzHWPH 9seg== X-Gm-Message-State: APjAAAWH3iILoHYUKFDEaB/3NQpz0xKJu6h2uxXcoJlNkilB/rTnCe/6 TBKp6jq4Et22zIv/d0p9nSk74A== X-Received: by 2002:adf:e8ca:: with SMTP id k10mr22532315wrn.50.1581634279427; Thu, 13 Feb 2020 14:51:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t12sm4446150wrq.97.2020.02.13.14.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 14:51:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 532851FF98; Thu, 13 Feb 2020 22:51:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/19] tests/iotests: be a little more forgiving on the size test Date: Thu, 13 Feb 2020 22:50:58 +0000 Message-Id: <20200213225109.13120-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213225109.13120-1-alex.bennee@linaro.org> References: <20200213225109.13120-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::443 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: fam@euphon.net, Kevin Wolf , berrange@redhat.com, robert.foley@linaro.org, pbonzini@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, Max Reitz , marcandre.lureau@redhat.com, aaron@os.amperecomputing.com, cota@braap.org, stefanha@redhat.com, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, "open list:Block layer core" , aurelien@aurel32.net 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 --- tests/qemu-iotests/214 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 index 3500e0c47a2..6d1324cd157 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 vs $sizeB)" fi $QEMU_IMG check --output=json "$TEST_IMG" |