From patchwork Fri May 25 13:38:17 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: 136892 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3618106lji; Fri, 25 May 2018 06:51:53 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLqdJtnT6+2fcB/dENtsXWzD8k3qm8OFodzCNxPmf1vnr1tGViVSE1HZ14xtyOXEZw0qj27 X-Received: by 2002:a37:bbc3:: with SMTP id l186-v6mr2050886qkf.120.1527256313283; Fri, 25 May 2018 06:51:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527256313; cv=none; d=google.com; s=arc-20160816; b=SgfFf10mLQbhwmgBxpkScPbZ3rA9aAeCpiK8Sq2i7/WhwusCzKqnyDbAih+kt8yg2a 4oZOzsZI63H+YqIGo5ecJJV2oRpOmdAMnuQC8f2eVms6h5R1+3yk3k7PxYsZDMA4ArWk ZwPibaFuqPo5C/rbV3WtikxP6NJRhyQ0TpY8PLikdSsV68OOGXeg3mLlZoDuJqLGsRCv 03AfraAhWkPAmjaWi/WNwSRuTX98tNY5U+fiUNOqnPqSwhYC4v469DLHz0pP2pq5zYtR wq5O18mI3omNvoHIR6k6fgsOPNXBqj924VDKzKYjC2m3o0fGgzRrXTSnntwYdwPlhlQh NT6g== 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=E0sIseL3Tk49dp2x7SMiYR5Vtcyw65ihwAlG/FWcOxh8aFBOej6oWD34Xcmnxz0J4A BceSGbvwWx9gaCy2JQwq1vJ1CPVwI1V+dhdAIOuxtRGEkpfuC9yCIv3rG59PP/c/4wml TSPNkSQF+ACnUy+ab+TiHYi7XnfSdRfcemv/C2RkjV3WSmMvQ7h8NCzv2zc/ushGBoLS A/h7Db3E30iFrfrcEOuXpkT1kssB2QpKvhbr6R9wYpI1kbF0hC8iL6JPRy0kpTfpmuoL lvWEGmhyEyiiA3ijQvJFS4vvBG4QxAwZe5mK+WRme4wMxGeh2//I8pieghfkr78pTug8 u/JQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=C5xafttB; 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 k5-v6si4064538qvg.7.2018.05.25.06.51.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 May 2018 06:51:53 -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=C5xafttB; 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]:44115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMD8K-0007PS-LO for patch@linaro.org; Fri, 25 May 2018 09:51:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMD1a-00023k-Tw for qemu-devel@nongnu.org; Fri, 25 May 2018 09:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMD1Y-0008S1-Ia for qemu-devel@nongnu.org; Fri, 25 May 2018 09:44:54 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:35660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMD1Y-0008Ri-8f for qemu-devel@nongnu.org; Fri, 25 May 2018 09:44:52 -0400 Received: by mail-wm0-x232.google.com with SMTP id o78-v6so14830485wmg.0 for ; Fri, 25 May 2018 06:44:52 -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=C5xafttBoQoeIo37E1cj9QDaeQ/uncZzcwZHqK8+bqvHprVmbsLqoXuZCkwHfpRaSz qRGLcEHFORCfEMIAl7gaYiV1b1A7L2MW7JbZeGGicv9c7sMcd+hApUQQ/1OT09snARWs rS9Q98kVjLlrepKSiXDO+ii7yrxxH7qOVJoIA= 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=ZI1e7RV7XiuEPnvlIU2xn6Un3lxIYvyYhffLJcxO8NCRwslBIGkmDAYjNF3xCbcL59 lOUG6f2LR/yqGZVLAuzSQJ70AwXhJ3ySieDRMQvPCb8kpZHoRPmDq8KBqYHwXP/dujXq HzqsJ6iMj5B3miCJVz9LQpw76gGj8+qyqHxb6Qe2+O/QywciQ3oA/bh1goVW6ek/oNHB SKTfbfYI6kHT2ulEVYLbp8Z+S2mULIdq/dAEvT4Q2VOUlBfDUrDzE+cORYsWf1jzNT/v qTUHGYvFBqd9BruS85CqkuGg2Q/K+T9CYYx9GGb6IVRaUHq4yl6cs9Eh8tRFuoG6eLML mccQ== X-Gm-Message-State: ALKqPweOVXmaQxz7W8jfRas2S04eE3VsMavfYSOQuihjPnRQkh0qJte2 p2JgqAzymhZZm3toJHreaqPxEA== X-Received: by 2002:a1c:4843:: with SMTP id v64-v6mr1798395wma.159.1527255891077; Fri, 25 May 2018 06:44:51 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y68-v6sm45498389wrb.91.2018.05.25.06.44.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 06:44:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 76D8D3E08BF; Fri, 25 May 2018 14:38:52 +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: Fri, 25 May 2018 14:38:17 +0100 Message-Id: <20180525133851.27161-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525133851.27161-1-alex.bennee@linaro.org> References: <20180525133851.27161-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:c09::232 Subject: [Qemu-devel] [PATCH v5 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)