From patchwork Thu Sep 17 12:19:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1366070 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=hk9Udpz1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bsbcr4sb4z9sS8 for ; Thu, 17 Sep 2020 22:19:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 340CF823A4; Thu, 17 Sep 2020 14:19:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="hk9Udpz1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A50DD823A3; Thu, 17 Sep 2020 14:19:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1903982396 for ; Thu, 17 Sep 2020 14:19:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600345148; bh=7NoO8eHM9YCFn3OtspBkWDcXcFjQfM+bWLgbRd4Waa0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hk9Udpz1/mWhMME2L8PPl6PZxgNQw9jKL0+0BoE2HmkoCH1u6PL3GOOwEgAyMyrPH nCejHDFF1kklZ+0wrVnkfWCzIGhneGhLU8aonW1941Fqj0DS8FluzIjE03TkWguVJy xn4zSUxz4piJTZCYmZMRpSCMB1Upjb8O49X7JUAE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MQMyZ-1k5KEU3o2b-00MKtD; Thu, 17 Sep 2020 14:19:08 +0200 From: Heinrich Schuchardt To: Simon Glass Cc: Bin Meng , Wolfgang Wallner , Sean Anderson , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 2/2] test: log: test message continuation Date: Thu, 17 Sep 2020 14:19:02 +0200 Message-Id: <20200917121902.57403-3-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200917121902.57403-1-xypron.glpk@gmx.de> References: <20200917121902.57403-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:c34BZkZlM6viFp9j+0ag5RAGw1/4x35KPRrzRaI/sKzBfwMGiCt Nkya3u1JijOuCW9unUBTrpvms5Bghecp14aXSc/wDZx4zNSUL1hittNl7768msqVB+SiYLi pRnEhdqSBzzzxb6Wq480whR1nH80uphnDGqvkeZOu7IQad1Ezx3x168uuE/gEmbmktB0P+M EXDQrK+ib4QLNMJmCjetA== X-UI-Out-Filterresults: notjunk:1;V03:K0:dcX4hyNCHpk=:Nl7ZfWatTpv+R6j/4pXYA3 TgXdz7HBwaOTmlXXxfNhyJ4mXICcP4DeW5OnsMuym0X865SKCTitUhRr/ZNLeQDdVvTI/Ay7i hzmlFN+bSKCBbyOjYKIog1s9NQHxa+X93w+8wFzb3mAlaMFHAW0HSImONca8zX5a6rncYVt85 c9l8Mn6futvB+i81JeYjXjmLapwLZefID5QSTERa24fTtKC9B6Nz6lAHbgKLTC5Ke3GUHckvh bvvgMLdLTgq1Qurr0sG+m76V0kqkkFAtZbh1TTwDWG07cAcu6+kzFqNFFNXeVmCkfLBgipPay nBqBq2DZV0UfbudwOwdvSmPKlZI0ALgU8odZBf3zHZ5qfiEjhptijkKQvaM1WxeyyLEMRyyGG 0Tq+aGSRY8HEaAgj4I8TYl+ywHjREBngCJ9FWIqUm4NA1vbfmG4cpJ/xEM56LJg1xHrs+orMI ot5p36pFUAcLMbLeE9Be5HDrnDJBxulzaj44TuwGI3wkQUmHePeE/OZVuENQEgbMJsJepGx/k 9uKhdvyFvZ6nHZ11V2klJLzwWJ8E30Pn5f28265patjy37xAkNRQrXMH5VDUbcf8DFvOIFdLy L/XxveMsw1ZiQ3Yo3LeMDH2TQxWT8BAJjlBnEwgx2biuUrmGht4vdY1+NMY4PPu3F5GK+3xiL aLj0blDkrVWQpqP4L5f5FIShfIM7L/+F+6JVEHNehAwRNhwO7lUDsjMNfUXign1qChPM2+jbn mj76Cr+kC36cQIxSXGfZOb46vFpA6bVcP3tzxf4nzpvooD8Q3SH++KwBwKspnosj4bF5DQLe3 n0YJw1mQTNbtT88bT3OyIpWTqS/uoa/TwfMDaapaV7/sQUaMDlpB/Gd2zIMW4FrcKuB4FD6tr mDWvqAxGPUKt163X+0MAy6/5K+yPqcdQXRQss6i/ZyCGcWso4sdYIOUVh07JVAN9egb0esQ8X mHywRvpGh73HQyJmlF7A9PTo7n+JKGpufnoLJwPOt2BnqkMC2UkvGjh/7Ymh+bE6CAYN4z/Ji dvxydttIQF2476x9DOV1DOZjUWxOT8HRNnRbXb9ddqdd73JR4C2atuqF8dtw6zZhEDjMmTSmL /wPrkGYT7daZ2BjXRR5vkcDpBQBoJdeRakuDdbbauDjbIbAPHHV7jx9SYE7v7lRJ50+H9gtRw n3P4MHFfxu7uqQppH5JOaEgplSkYWd9cb+tMM2JMJbMfjNDRzishK75gElaADcuh2jaI9hVKW GQ6XL0o2MHyNfJ+tVgvfg8CynpOL/jYjq2+D5Yg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Provide a unit test checking that a continuation message will use the same log level and log category as the previous message. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- test/log/Makefile | 4 +++- test/log/cont_test.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 test/log/cont_test.c -- 2.28.0 diff --git a/test/log/Makefile b/test/log/Makefile index 4c92550f6e..1f91c90422 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -12,7 +12,9 @@ ifdef CONFIG_SANDBOX obj-$(CONFIG_LOG_SYSLOG) += syslog_test.o endif -ifndef CONFIG_LOG +ifdef CONFIG_LOG +obj-$(CONFIG_CONSOLE_RECORD) += cont_test.o +else obj-$(CONFIG_CONSOLE_RECORD) += nolog_test.o endif diff --git a/test/log/cont_test.c b/test/log/cont_test.c new file mode 100644 index 0000000000..68ca1d262c --- /dev/null +++ b/test/log/cont_test.c @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2020, Heinrich Schuchardt + * + * Test continuation of log messages. + */ + +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +#define BUFFSIZE 64 + +static int log_test_cont(struct unit_test_state *uts) +{ + int log_fmt; + int log_level; + + log_fmt = gd->log_fmt; + log_level = gd->default_log_level; + + /* Write two messages, the second continuing the first */ + gd->log_fmt = (1 << LOGF_CAT) | (1 << LOGF_LEVEL) | (1 << LOGF_MSG); + gd->default_log_level = LOGL_INFO; + console_record_reset_enable(); + log(LOGC_ARCH, LOGL_ERR, "ea%d ", 1); + log(LOGC_CONT, LOGL_CONT, "cc%d\n", 2); + gd->default_log_level = log_level; + gd->log_fmt = log_fmt; + gd->flags &= ~GD_FLG_RECORD; + ut_assertok(ut_check_console_line(uts, "ERR.arch, ea1 ERR.arch, cc2")); + ut_assertok(ut_check_console_end(uts)); + + /* Write a third message which is not a continuation */ + gd->log_fmt = (1 << LOGF_CAT) | (1 << LOGF_LEVEL) | (1 << LOGF_MSG); + gd->default_log_level = LOGL_INFO; + console_record_reset_enable(); + log(LOGC_EFI, LOGL_INFO, "ie%d\n", 3); + gd->default_log_level = log_level; + gd->log_fmt = log_fmt; + gd->flags &= ~GD_FLG_RECORD; + ut_assertok(ut_check_console_line(uts, "INFO.efi, ie3")); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} +LOG_TEST(log_test_cont);