From patchwork Thu Dec 19 10:49:16 2019 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: 182083 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp313206iln; Thu, 19 Dec 2019 02:54:37 -0800 (PST) X-Google-Smtp-Source: APXvYqzmXx8BQrVy8IAF6iNZ9mhlvVmKsthVXRlA2V9ck9tU6u3UbgRwSb+1CmwIimND4zXQGlLq X-Received: by 2002:a05:620a:134d:: with SMTP id c13mr7183135qkl.322.1576752877039; Thu, 19 Dec 2019 02:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576752877; cv=none; d=google.com; s=arc-20160816; b=CVp3szDgABnodV/+ioatx7r0f1oUFrHueUTINe1jHwhPqTO9YQTi22PLkN7hfb717W dOqKRA5YT4NeE1GhmgEtiKj2Hwq5bT3otWZWVpmZPdbwLwwdJm8SK5i9LCO0NfM0Oo8A D0binsnzo4uLszLUrzN6/TVmmT/ZUVwaP9JlNEoOvS5autfFOe598tBMcorwjOPWxn32 nrufOC0cXnbORcOY+LWpw2Z3W1yarWDgfNbcLNKUvGT9hPniS04KIAxQSc/YJflGnRM4 O76lGlfC9EcjPcEIsbyDRLmq3P/eGDdhn+THNmLjxAqGHX0TCtqjnMfQ0WN3yG5tLV40 EBpA== 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=O/LDCXsheLvMycNdYAZzehR+/HRrv8aczpwXJp22nJc=; b=gfQZg6/P2RSszi9HPlZ0QdKZSF+m9bS2Hl39KIqJyuGgP7XHr3mVYISkKKhBVDkIFI aD71pdJ8jeFFLddsZ/2lXjt4/jN8fGSXzdONZLBJkbWnT1eA4notwFAJCIr2CNUAnVsS +tGOFOl4WlkqQWE4jY9cbJ1Cg0ibgScd6b49F3Lmyz9uboYpJbRVpAgdwXvNXdVG8t3d vPCWwsD1jIe73CT+2m/IjA8U6q6eu5gZyglreX/WbgmiAV2VJ5M2jmsUM8cpP6qOJdE9 v8iCwliNs+NzwKmd5xmRvNfY/ZldJ8lq90M8+vyslzxTdmlGip/OlhylJXiY71VYkfRs JEIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eZmFWH30; 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 h26si2875384qtp.393.2019.12.19.02.54.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 02:54:37 -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=eZmFWH30; 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]:38798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtS0-0005c8-0K for patch@linaro.org; Thu, 19 Dec 2019 05:54:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39543) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtNO-0006kt-8Q for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihtNN-0000QR-0p for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:50 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:35830) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihtNM-0000Ca-Ms for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:48 -0500 Received: by mail-wm1-x330.google.com with SMTP id p17so5127426wmb.0 for ; Thu, 19 Dec 2019 02:49:48 -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=O/LDCXsheLvMycNdYAZzehR+/HRrv8aczpwXJp22nJc=; b=eZmFWH30IrBfN1MziG/qW+3RWVe/g4NkTMXUkb1xBkeBUAsVgVtaLQEqrrVG8h/PRr rm2YilrGBrpZyXdJTihaipMzia76CJq9TNHxjE3KCI84vTseTO9b3tkuLKRlXGpIR99q h2D+RCFDQlak7QTY8nGqQr34sbEtl3+vzsz7SPC0Mwgy81n5j1x+HU/d8O7xlMlk2VOF jbE11X4kWWLZgvKY28x3OCnbU0gtm3OH9MCVG5Zu7Q/WSzU0V8ATfm10qD4HRomf8KOW NZjcfYn9I7e6WB80wR6RtRsc149SFkHREVrjdSvtpb1i/0d0YACRWMwgpuexzKzKCCy8 pEig== 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=O/LDCXsheLvMycNdYAZzehR+/HRrv8aczpwXJp22nJc=; b=MFL5t2Wex4HOLaRxlCl7zoeD478zISbnII6tgLbuwWwQ3iLdP0GOKo37rL+Hc4IhRH UvJA0f5NReo3QJN+PE4XtMNnAR+Ym1nt86IU4DAAXCU0bd8chWDR13buqUo/P4TkZZmy DqEDE7iLfpT1VQASPewXyrpxFpaAEzt9EQoBDMHfxOkhWinSgJU5mNcc/9ke70AJUjgu 2q9Xx55XnDf4R5bz6xAs7dCbulfMRgVlqSR253Kw3v+HCLl8TA7rWnY9EAQGIyXbX1NZ JACPlGs9E79poGbm5mmdJJ29FrlRCYoQ9YQjDBqS0ojeb0o9ukhpCy2QK3UmtJd+WADr qP5A== X-Gm-Message-State: APjAAAUJr5/3SgHa/LvLacrA4JSFlQrj6vTgJE/+k8Cnc5guiZQw4iw9 qkeRyA9In6BpD3ZVCM0k7AA0G3eXse0= X-Received: by 2002:a1c:41c4:: with SMTP id o187mr9248520wma.24.1576752586289; Thu, 19 Dec 2019 02:49:46 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e6sm5932997wru.44.2019.12.19.02.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 02:49:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 179341FF96; Thu, 19 Dec 2019 10:49:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/25] tests/hd-geo-test: Skip test when images can not be created Date: Thu, 19 Dec 2019 10:49:16 +0000 Message-Id: <20191219104934.866-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org> References: <20191219104934.866-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::330 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: Laurent Vivier , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth In certain environments like restricted containers, we can not create huge test images. To be able to use "make check" in such container environments, too, let's skip the hd-geo-test instead of failing when the test images could not be created. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20191204154618.23560-5-thuth@redhat.com> -- 2.20.1 diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c index 7e86c5416cc..a2498005440 100644 --- a/tests/hd-geo-test.c +++ b/tests/hd-geo-test.c @@ -34,8 +34,13 @@ static char *create_test_img(int secs) fd = mkstemp(template); g_assert(fd >= 0); ret = ftruncate(fd, (off_t)secs * 512); - g_assert(ret == 0); close(fd); + + if (ret) { + free(template); + template = NULL; + } + return template; } @@ -934,6 +939,10 @@ int main(int argc, char **argv) for (i = 0; i < backend_last; i++) { if (img_secs[i] >= 0) { img_file_name[i] = create_test_img(img_secs[i]); + if (!img_file_name[i]) { + g_test_message("Could not create test images."); + goto test_add_done; + } } else { img_file_name[i] = NULL; } @@ -965,6 +974,7 @@ int main(int argc, char **argv) "skipping hd-geo/override/* tests"); } +test_add_done: ret = g_test_run(); for (i = 0; i < backend_last; i++) {