From patchwork Tue Jun 19 15:43:52 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: 139170 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5378303lji; Tue, 19 Jun 2018 08:57:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKInETEDSFSdUEqFXr3eYWsGxtUYbKJARc6HjTl+xeWn+G4VWHMj8IkoBr9GtOLwQhpFcyMN X-Received: by 2002:ac8:fdb:: with SMTP id f27-v6mr15849836qtk.293.1529423828876; Tue, 19 Jun 2018 08:57:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529423828; cv=none; d=google.com; s=arc-20160816; b=NTxTwGFKJcCR6e9MH1/UyZZwrwnM/QcKsAgdjZpw+Ketj9S4r20+XFEtlWXuS3Nd2M oaprGQPEhON3x+AJQFj1cZ8ofxGP3SzNItx/3vgf1X/VzecdsFFSbeO+BARZwv182naN Dg3vs4h18zdBwmaJzrRas5swPXiJffWFPZlf7Pf3bOQ/GD0oZ/fiuigAKds/y6/0Z802 Lc9RFPVClEfo4ndCYgH3LPJFwfb382tST7QnZ2d9OSHkujmUAhw/4SueU/4dVHWUan3u F/VSdQrVNfVkNy5ggis/vK508x3JGDa12vsK8Qku/XJPuWq4HnyWRJ5BFwegpc5ka/qe 0GyQ== 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=/nkM0or5+Du/RsMIFS1xlzwsRoxsnYz5QSMfDbOvg2I=; b=B1gaLebMYFYd67gF/t89/aO9pXegqzHZQWf60WPSk8qGV2HAXVEVPGyGon3sdJgw5k v0hDykG9D0VbIewF+wmemZnkAKYp494mrMTC8ZqfsiNb2z3hGCD1CC3xmMr6qzBhtjpe 8bILGAsGaiE2PMVnddgAF6Ni7R7HjtRbOGs0G5QROkMRn1FaDrsKeEq+0L4/nHag7Wer FCJQyOPlFQUeec+MF/Hht9Fzztt+D/gjk5KyTU5ysVGbRqn8EKxU9G7CKQnC9AGEJZyl TGkTmNDpp5dbghZk8FS4qxqacl+R8dF+/nBPMUYyXFp+hdZBDBONLvbJwcd3L0VQKeNI OSjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CnFubEAD; 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 n32-v6si51379qtf.69.2018.06.19.08.57.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 08:57:08 -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=CnFubEAD; 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]:43400 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ0G-0000J0-89 for patch@linaro.org; Tue, 19 Jun 2018 11:57:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIoN-0006ez-4H for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIoL-0006Rx-ID for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:51 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:54241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIoL-0006R2-8F for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:44:49 -0400 Received: by mail-wm0-x236.google.com with SMTP id x6-v6so1164578wmc.3 for ; Tue, 19 Jun 2018 08:44:49 -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=/nkM0or5+Du/RsMIFS1xlzwsRoxsnYz5QSMfDbOvg2I=; b=CnFubEADkBLNzrU7qksmPrFiXRqqMrViwHxLSSuE/U/qIXr/zlO4OB0PYu4D4wvhTt Yu/bZVjSiq1oXaIXtlmvyH9vfnrgdv1RyeBkHd3qV4GeCgaRyE/++OgBfXGsEOZRBrAo s7YR+30lMWgLiC3+gg2BrfCD8Exk1yubQCpFg= 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=/nkM0or5+Du/RsMIFS1xlzwsRoxsnYz5QSMfDbOvg2I=; b=AtzglT+ccz9ynpSCXwe3LFW/x3P+TyPQssWUtekKawggucoS28CJuvgqMwtFYP8uWI iwBYfquuhIOsg4fjrvV/ijFxhpmFdjwCTGc9MnYFvYde88tEu//8uXxuKyuBm0P29DS+ ZWFqyN4aFEjobrBdflaYWWtnTrNH5iIZ1/YfR1+aPS3U8HVItSgd6jnJCBFkc1EGtZBO n2QwcLOzJnGRY3O1dpKHs2G5BK2bRY+cZt4PgtHI5gbSNt/Au+rkDuwrgkKXI/MddC+u nD3/GbhP2518mtG0qPsYuGRzmrH/qrtHQKD5LuLBwvE2MSB4yRnpBnubkWng4SaMT7G2 tyFg== X-Gm-Message-State: APt69E1/NTGgN2pPE9G3EM/y2/vPe4D+uTlSxJbTCK45G5pdYVnQAk3S +iylAM0GpSWv3gtGO0X0o1/iww== X-Received: by 2002:a1c:7a06:: with SMTP id v6-v6mr12494589wmc.90.1529423088088; Tue, 19 Jun 2018 08:44:48 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m185-v6sm298769wma.36.2018.06.19.08.44.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:44:44 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8C3ED3E0AC0; Tue, 19 Jun 2018 16:44:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:43:52 +0100 Message-Id: <20180619154435.18898-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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::236 Subject: [Qemu-devel] [PULL 13/56] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net 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 Reviewed-by: Thomas Huth --- v4 - remove space in fprintf () to keep checkpatch happy -- 2.17.1 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)