From patchwork Tue Apr 24 15:23:34 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: 134137 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2427404lji; Tue, 24 Apr 2018 09:14:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo/ECQKM4gjDuVpkqiC4FgIkV1Ryrv+UuNgJTqtJbAjjD6liD6yS31hMnKlKDfLznGqnoOa X-Received: by 10.12.178.66 with SMTP id k2mr4599305qve.26.1524586449865; Tue, 24 Apr 2018 09:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524586449; cv=none; d=google.com; s=arc-20160816; b=zlEfrdSPzGgH1gVCdu+md+p+puhWk6egkkx6z7ljl4zi4fpn6VJRks2KoWYufW/k6v VFD3juHuaavaQUe/YyvKmyEN20cW7zAEf31vBHIgp9UxYW3lAcb4ojlj3unmlAC/57LZ lF+lxu7o+ZEd7N1LCwuENNcj+gDosgPB4mfwJ4WdRWvONeJvDshyr9wBiHJrILjKggCt ZSZm/+OxCpTQhag9H99ThE3Quj2v1tNnaigY+wIQqa6cPUDE+x3wjsPp2XJStMHn6NZU gB0gyzRUfORsDovWvedKzSWH+0TCbdDvdRQvleUN+48Xz0/PKmLvWJjUJXBS3awcdORm e1WA== 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=pZ2dxzsmLbwkNXgVwN5Vj5ix3tpSpvfBHbFRT38ebsA=; b=ACGx6WR1FnQ5jxfVZee9DAb0gYuAS57hgecpCQu+KpvcUhzX+8XD63NRczHakTL6re 9dJec+eiEDJGR3s38CdO2jUz2bmmBKozh4PW2pdb194sIEByPDKXR/0b4ocZ+d/bcai5 rPBUGkEJKxMQ512Ocj0clXFPSD/m4nurFUt2g09p3zdqzB68CJ7EjbSXyw2SyKDoXGtk 2CDYbdmvCqhO6dBq7mSd1ATOSFEUUST0nOxlkbNQv+mlPqTYyhGQkp0ZoMj6Kj7f4OXe y/oWDwmkCYGW57aouMkz62yuNBchjhLuSCBnsxusqkKl6hjtlY5jQuz230d3eivfRDez XMfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iwP20qBi; 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 104-v6si17940502qta.58.2018.04.24.09.14.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 09:14:09 -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=iwP20qBi; 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]:59392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB0a1-00044X-6u for patch@linaro.org; Tue, 24 Apr 2018 12:14:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzwX-000612-9J for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:33:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAzwW-0001Yj-6F for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:33:21 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:41572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fAzwV-0001Xe-Tn for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:33:20 -0400 Received: by mail-wr0-x242.google.com with SMTP id g21-v6so22927859wrb.8 for ; Tue, 24 Apr 2018 08:33:19 -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=pZ2dxzsmLbwkNXgVwN5Vj5ix3tpSpvfBHbFRT38ebsA=; b=iwP20qBijlGo0nHCCoH2A3aACuKjFpah1RrTcanfT9/MvG7+00U4x1HnyKEsww1z4+ 0zJmvHKImb2dTrRwIFHpC0v6SfhPeQRyZxK8eK9Mhk8+jR++hII8foRcqg1TmsUfNJMA 4mPmikwqgY9vc4BjgwPrMEKgbilBW0NdMqX+g= 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=pZ2dxzsmLbwkNXgVwN5Vj5ix3tpSpvfBHbFRT38ebsA=; b=JfvmufWPGDxprW6mV3vjH0/0NC7Pu+qrHEWURO6pulPtggYO4c0P5BM7YFLNhpqSe4 nwkNAtBDOKZJBJFrQZg+MiOB3rEiibTYscNODQLi2Q+h+NPr8W5acaVfG/datYUZFF5i bkuVzYhxD86KQwmbSa9h6LgGkUM8XXWsdjwq+bQDYGpWtghUOOk4bFWZ2PJ66Qgkfizn VcusgLjROXsHbIe7Ylya9VZg1a6eQ9Z9AuSSctj+CGh3AhwWXXoFc2zHWjVkNUwQyrjd +wWj1eF/Ful2LAgh2b1I1Mepw5ILhvMFvUyBlgKGgTR29lYANQWRFARBbLKv9U9qWMBe WcFQ== X-Gm-Message-State: ALQs6tAzgZgLChCdIB/bolKs/XK9daCqnVbpcSGXZ/dGIZEn5GnoZbeS vQDizNYmKj5/8bJYRrnLBczYTQ== X-Received: by 2002:adf:9789:: with SMTP id s9-v6mr21486736wrb.28.1524583998724; Tue, 24 Apr 2018 08:33:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n79sm16548036wmi.20.2018.04.24.08.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 08:33:14 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8C11D3E0A9D; Tue, 24 Apr 2018 16:24:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, 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: Tue, 24 Apr 2018 16:23:34 +0100 Message-Id: <20180424152405.10304-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org> References: <20180424152405.10304-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::242 Subject: [Qemu-devel] [PATCH v3 15/46] 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 --- tests/tcg/multiarch/test-mmap.c | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) -- 2.17.0 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mmap.c index cdefadfa4c..fd6ecc4880 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -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)