From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3CD2C4360C for ; Fri, 27 Sep 2019 10:42:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB68A217D7 for ; Fri, 27 Sep 2019 10:42:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726884AbfI0Kmj (ORCPT ); Fri, 27 Sep 2019 06:42:39 -0400 Received: from foss.arm.com ([217.140.110.172]:48754 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726179AbfI0Kmi (ORCPT ); Fri, 27 Sep 2019 06:42:38 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F3290142F; Fri, 27 Sep 2019 03:42:37 -0700 (PDT) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.197.44]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 32E2C3F534; Fri, 27 Sep 2019 03:42:37 -0700 (PDT) From: Andre Przywara To: Paolo Bonzini , Andrew Jones Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [kvm-unit-tests PATCH 4/6] arm: selftest: Split variable output data from test name Date: Fri, 27 Sep 2019 11:42:25 +0100 Message-Id: <20190927104227.253466-5-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927104227.253466-1-andre.przywara@arm.com> References: <20190927104227.253466-1-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For some tests we mix variable diagnostic output with the test name, which leads to variable test line, confusing some higher level frameworks. Split the output to always use the same test name for a certain test, and put diagnostic output on a separate line using the INFO: tag. Signed-off-by: Andre Przywara --- arm/selftest.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arm/selftest.c b/arm/selftest.c index 28a17f7..a0c1ab8 100644 --- a/arm/selftest.c +++ b/arm/selftest.c @@ -43,13 +43,16 @@ static void check_setup(int argc, char **argv) phys_addr_t memsize = PHYS_END - PHYS_OFFSET; phys_addr_t expected = ((phys_addr_t)val)*1024*1024; - report("size = %" PRIu64 " MB", memsize == expected, - memsize/1024/1024); + report("memory size matches expectation", + memsize == expected); + report_info("found %" PRIu64 " MB", memsize/1024/1024); ++nr_tests; } else if (strcmp(argv[i], "smp") == 0) { - report("nr_cpus = %d", nr_cpus == (int)val, nr_cpus); + report("number of CPUs matches expectation", + nr_cpus == (int)val); + report_info("found %d CPUs", nr_cpus); ++nr_tests; } -- 2.17.1