From patchwork Thu Jun 21 06:25:22 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: 139496 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1706216lji; Thu, 21 Jun 2018 00:09:11 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKV62OkK8av6JCttpiU3fDTXtT1OjTBdP9zqf6fgdidRJacPknxD+m15ZKtI5EyMDxP5e3A X-Received: by 2002:ac8:27ab:: with SMTP id w40-v6mr22495699qtw.373.1529564951661; Thu, 21 Jun 2018 00:09:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529564951; cv=none; d=google.com; s=arc-20160816; b=IUx4Zt6B3ynCLK6zbFfboqeVm5UZv+UT4bTSXlKFtrjaL8ykyufT66EWM8DRSxR5NZ Fi29zNeb5YAPOByIEFi8PKjvyZSHmogaXvAbauibcmVi+FcVO/lLMo00G686lafgH87t baGQ8rMoCYSOq06lDLYm65xKMPiSKqmag7n5w3SPOWQDhZiJxL7ORBhB9YCZRKnW866X o/kVXZutqu0Y9aCKD9m1+tyDJgt049QdKHqVog4D2M4HtleWOaD2uyAIrwDg0gy8Y2XW C5GFpkps9/RucL57PopxmVcsNMsCNqG4BKCfYfsutFOQhCbbgDc4eBrK6IQp5lSGBHRw aMFg== 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=TKe4IZXxVyK4HmY4tv1t5bzoCurjUL7eNXO50N5SHaY=; b=x64DPURgZ/FpEDOcv0pGA8Su+ezyBLdhyaTBYP28vLADF4hJou9/i9TNlV6MXqa210 qWyWixxEvonguNxropN0KG7oaxi+eb3f9tRKvUNepSRVbuiK179OU1x9Llod0t1SDdjE qzGRslHWVbALNerTE6egsJhU5Q4kUHy3Hy4zR69NNxNYrOncXw4yxzGd2wyU3KHi3Cr3 vYWkrBO+DWj+DwmKqOXQXKR3MFKgXHaLYYG06x1LlkeTRdKntNOg5uhvb+gBN80fElA1 CjikMGM0WrarGVaX+Z6d9Qge7Gw3LF+slVnzKHEOVy8JtG/LnBm6WJSXoD2z0dQfy0eI Z2GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O8mobcVZ; 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 h46-v6si3814953qth.404.2018.06.21.00.09.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jun 2018 00:09:11 -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=O8mobcVZ; 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]:53474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtiR-0001Bk-3C for patch@linaro.org; Thu, 21 Jun 2018 03:09:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtIB-0004zA-DE for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVtIA-0003Ol-7g for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:42:03 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:39314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVtI9-0003Ny-Ts for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:42:02 -0400 Received: by mail-wr0-x233.google.com with SMTP id w7-v6so1853795wrn.6 for ; Wed, 20 Jun 2018 23:42:01 -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=TKe4IZXxVyK4HmY4tv1t5bzoCurjUL7eNXO50N5SHaY=; b=O8mobcVZmiA7hFrbhRLdnq9LauEUYTHU4costCPc7HeUJV9Z7KmZf/HB+S+6rM6svv rktuHp9KMGQj5hL4trEi8O1Irc7QE7cmgz8+2h3T+SPgst//PJkiDFz/6Lm0XcL/oEEA a4hh7wQ9mVaVD8sKR/RfocTmVbYwqhYpRYi2Q= 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=TKe4IZXxVyK4HmY4tv1t5bzoCurjUL7eNXO50N5SHaY=; b=JZ75AATiDV2rl+FNev+M0GYlgCF6rdXtQb25mt4VG9QV9JS5JQ5gEb1oICXSZ0DW9h lvE1hdlOdzgep/7rKXQbecTKMK9CwCULPzkfSpNjaUd1vBuQ6OVuDZeyXvGMk8sxOa8g vG8wVpEkocHVBnZGNa5cnfVNlsM2XvNgW4aVVEJkN6lutlDxH/bbuLbx69cxfyKaxsLB nrc9HacxtUOMJnwKQirYEvGkTsqC/2q5S9cV+9EYMLf3Clv/bpzsQtab0oo/NnQpP7tn yA0AW14dQzSblVfuyiTTzi8t5XuC3UeoHQd8/bAW66z58y0MGv7dD14AgRuqG/C/9TJ8 W6vQ== X-Gm-Message-State: APt69E0ip06JKcJVifPI2DP/jwemTSwaqGR9ooobhKloLDJBfTZBwfEO EQulUmQ2LWVyX8m+8hmghjN7zw== X-Received: by 2002:adf:b219:: with SMTP id u25-v6mr20830137wra.1.1529563320823; Wed, 20 Jun 2018 23:42:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m65-v6sm5947323wmd.1.2018.06.20.23.41.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:41:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 706333E0B3C; Thu, 21 Jun 2018 07:26:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:22 +0100 Message-Id: <20180621062605.941-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::233 Subject: [Qemu-devel] [PULL v2 14/57] 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 -- 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)