From patchwork Thu May 17 17:46:44 2018 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: 136178 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp247788lji; Thu, 17 May 2018 10:59:54 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp5Q0p7GfwqdgWix1ZMi8ZmYBSCBYQjDetZwUGYICEzx4+AOyuL92BaZ68b2QDupSvvQVfx X-Received: by 2002:aed:2ba3:: with SMTP id e32-v6mr6417551qtd.272.1526579994691; Thu, 17 May 2018 10:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526579994; cv=none; d=google.com; s=arc-20160816; b=CH9RovpkfgMTrCMM8vvGZ/cM4tYW5tvOTaAHBq/XRgKLX2/0gs1/B1ZB6jvx0VAU5r jNK58xyYN4fNYILY/QvAQ0h3DzlbLP2pMw0/Zo8mSsA1fjswIppNaEvzWgh74yURdfwP MDu3iUMztuCsHKxTAQNgnT5/EOzrovhO194ncStrajdPcJYjVSjruTIUkcDiKH257QxY piXXfqq/BHaG7NdpD6j6+fyfmiX76u3y8jfL+ANC4oqLtXBhjlURnG6jtNMibKspULFl cYBPQtTUMX5+1ymL7+MhBvVAWq0XqjtvHnPoDH0TBU9GWjHsjSaU76mFftWTQKyhi5W6 OCWw== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=skGRUA2XLmNtsowTQPOQY7gIyZp4Mjnan53YDVBoxic=; b=Yacvki0azOaa5F5IWE3qmMeDV3h2pmvTitHgFVUzGSdY0PIg0E27FC55bTlDHI2K6f qy/ZDEE7OOadlyo+VUHumgjqMmrsJpxP8GahG4N3mHD8gy/fnnQQwgvgAGpc1djISV0j PXIAwnvRv29bR6OtDAl5kTRkA6gwNEJ9pzdpBxClapBZfyI+01ROuPvDoG3cucxry8kC 5M4+rtKaUuVxXS3yZWIsFwe8GL1puy0j5Kshg+A3jilFli2sGJpUD2sd9i8VC+K8H63v bgJW6ODbX1561IBrYxwGzVVKx0oVbIrk8x6JwOsRNmZHpJf/VDqOSCyKGLtrTAf8bcUJ y4gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I4ETtjFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s9-v6si899327qtg.195.2018.05.17.10.59.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 17 May 2018 10:59:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I4ETtjFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:38483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJNBy-0007NU-52 for patch@linaro.org; Thu, 17 May 2018 13:59:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJN6Q-0003JH-5X for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJN6N-0007Cc-VA for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:10 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:46283) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJN6N-0007Bv-LX for qemu-devel@nongnu.org; Thu, 17 May 2018 13:54:07 -0400 Received: by mail-wr0-x232.google.com with SMTP id x9-v6so3700103wrl.13 for ; Thu, 17 May 2018 10:54:07 -0700 (PDT) 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=skGRUA2XLmNtsowTQPOQY7gIyZp4Mjnan53YDVBoxic=; b=I4ETtjFlKB4N3ZFRXtvSaK2CTlUtnPHJpCYYtPZCDWsJPAbY4aXfdy3G84emYS1EWY UOOsMKujA/SGkw8/DWX8Idle5YaLbZKs6+aVmPIV1lv6Bs3zfRXC+1K047LN79/skC8a BV/pGdHyIz5V6y90f+4d4GUfIQARDl5znpihE= 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=skGRUA2XLmNtsowTQPOQY7gIyZp4Mjnan53YDVBoxic=; b=rMWwmmXPTyAf3A4Ihpym7Bg+0e7DvH1W6WCPj3BECufIYldPK5oRjEsFBBeadrwFOa jKllDFmNj2ROD4Lrk6EqNIOmV7G0G+GYhwFRzRGNcwsWFuY1capm8x+oOHaqqlzRXg3q UpZyrMd3JEEuqondXY+sD/85l+ngeUtulNJ3KRZK7Jp3x/qPxPV+sY/DRsJ9H8GQM2MK NZAHJ8SCKdLWn3ifv7N/fO+f/YOqBwWOYiQ7/9Yw8jSWYcZI1eABQh8wI0zMFMu7phFf HERZlQB9fRNM2FMXeJGtvKTeak0m1xPs2m/9t1trQGamMKHyutkX3d+rVtmsQAvoy8fs XspA== X-Gm-Message-State: ALKqPwdxuFRTmd4Q3ujIkhLcltMb4jKZx2UZHEy+YaB8T18LT1zGDKjp wjlIDPJvHB3fe05NN3q7VdTIOA== X-Received: by 2002:adf:a58a:: with SMTP id g10-v6mr5383468wrc.233.1526579646464; Thu, 17 May 2018 10:54:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q194-v6sm9001254wmd.26.2018.05.17.10.53.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 10:53:58 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F2EE83E0E24; Thu, 17 May 2018 18:47:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Thu, 17 May 2018 18:46:44 +0100 Message-Id: <20180517174718.10107-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180517174718.10107-1-alex.bennee@linaro.org> References: <20180517174718.10107-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:400c:c0c::232 Subject: [Qemu-devel] [PATCH v4 15/49] tests/tcg/multiarch: move most output to stdout X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The default test run outputs to stdout so it can be re-directed. Errors are still reported to stderr. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- v4 - remove space in fprintf () to keep checkpatch happy --- tests/tcg/multiarch/test-mmap.c | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) -- 2.17.0 diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mmap.c index cdefadfa4c..5c0afe6e49 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -36,7 +36,7 @@ do \ { \ if (!(x)) { \ - fprintf (stderr, "FAILED at %s:%d\n", __FILE__, __LINE__); \ + fprintf(stderr, "FAILED at %s:%d\n", __FILE__, __LINE__); \ exit (EXIT_FAILURE); \ } \ } while (0) @@ -57,7 +57,7 @@ void check_aligned_anonymous_unfixed_mmaps(void) uintptr_t p; int i; - fprintf (stderr, "%s", __func__); + fprintf(stdout, "%s", __func__); for (i = 0; i < 0x1fff; i++) { size_t len; @@ -106,7 +106,7 @@ void check_aligned_anonymous_unfixed_mmaps(void) munmap (p4, len); munmap (p5, len); } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_large_anonymous_unfixed_mmap(void) @@ -115,7 +115,7 @@ void check_large_anonymous_unfixed_mmap(void) uintptr_t p; size_t len; - fprintf (stderr, "%s", __func__); + fprintf(stdout, "%s", __func__); len = 0x02000000; p1 = mmap(NULL, len, PROT_READ, @@ -130,7 +130,7 @@ void check_large_anonymous_unfixed_mmap(void) /* Make sure we can read from the entire area. */ memcpy (dummybuf, p1, pagesize); munmap (p1, len); - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_aligned_anonymous_unfixed_colliding_mmaps(void) @@ -141,7 +141,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void) uintptr_t p; int i; - fprintf (stderr, "%s", __func__); + fprintf(stdout, "%s", __func__); for (i = 0; i < 0x2fff; i++) { int nlen; @@ -180,7 +180,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void) munmap (p2, pagesize); munmap (p3, nlen); } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_aligned_anonymous_fixed_mmaps(void) @@ -194,7 +194,7 @@ void check_aligned_anonymous_fixed_mmaps(void) addr = mmap(NULL, pagesize * 40, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fprintf (stderr, "%s addr=%p", __func__, addr); + fprintf(stdout, "%s addr=%p", __func__, addr); fail_unless (addr != MAP_FAILED); for (i = 0; i < 40; i++) @@ -212,7 +212,7 @@ void check_aligned_anonymous_fixed_mmaps(void) munmap (p1, pagesize); addr += pagesize; } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_aligned_anonymous_fixed_mmaps_collide_with_host(void) @@ -225,8 +225,8 @@ void check_aligned_anonymous_fixed_mmaps_collide_with_host(void) /* Find a suitable address to start with. Right were the x86 hosts stack is. */ addr = ((void *)0x80000000); - fprintf (stderr, "%s addr=%p", __func__, addr); - fprintf (stderr, "FIXME: QEMU fails to track pages used by the host."); + fprintf(stdout, "%s addr=%p", __func__, addr); + fprintf(stdout, "FIXME: QEMU fails to track pages used by the host."); for (i = 0; i < 20; i++) { @@ -243,7 +243,7 @@ void check_aligned_anonymous_fixed_mmaps_collide_with_host(void) munmap (p1, pagesize); addr += pagesize; } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_file_unfixed_mmaps(void) @@ -252,7 +252,7 @@ void check_file_unfixed_mmaps(void) uintptr_t p; int i; - fprintf (stderr, "%s", __func__); + fprintf(stdout, "%s", __func__); for (i = 0; i < 0x10; i++) { size_t len; @@ -294,7 +294,7 @@ void check_file_unfixed_mmaps(void) munmap (p2, len); munmap (p3, len); } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_file_unfixed_eof_mmaps(void) @@ -304,7 +304,7 @@ void check_file_unfixed_eof_mmaps(void) uintptr_t p; int i; - fprintf (stderr, "%s", __func__); + fprintf(stdout, "%s", __func__); for (i = 0; i < 0x10; i++) { p1 = mmap(NULL, pagesize, PROT_READ, @@ -327,7 +327,7 @@ void check_file_unfixed_eof_mmaps(void) fail_unless (cp[pagesize - 4] == 0); munmap (p1, pagesize); } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_file_fixed_eof_mmaps(void) @@ -343,7 +343,7 @@ void check_file_fixed_eof_mmaps(void) MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fprintf (stderr, "%s addr=%p", __func__, (void *)addr); + fprintf(stdout, "%s addr=%p", __func__, (void *)addr); fail_unless (addr != MAP_FAILED); for (i = 0; i < 0x10; i++) @@ -371,7 +371,7 @@ void check_file_fixed_eof_mmaps(void) munmap (p1, pagesize); addr += pagesize; } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void check_file_fixed_mmaps(void) @@ -384,7 +384,7 @@ void check_file_fixed_mmaps(void) addr = mmap(NULL, pagesize * 40 * 4, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); - fprintf (stderr, "%s addr=%p", __func__, (void *)addr); + fprintf(stdout, "%s addr=%p", __func__, (void *)addr); fail_unless (addr != MAP_FAILED); for (i = 0; i < 40; i++) @@ -426,7 +426,7 @@ void check_file_fixed_mmaps(void) munmap (p4, pagesize); addr += pagesize * 4; } - fprintf (stderr, " passed\n"); + fprintf(stdout, " passed\n"); } void checked_write(int fd, const void *buf, size_t count)