Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1798342ybb; Thu, 26 Mar 2020 07:32:54 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu0pBFQE7FKuW9Y017Aa0g5QmEXvBicOrhK01xBHDLyZFb4DjLlWXWxIJy6XG3Y1LPbOXJV X-Received: by 2002:aca:acd5:: with SMTP id v204mr220502oie.124.1585233173791; Thu, 26 Mar 2020 07:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585233173; cv=none; d=google.com; s=arc-20160816; b=nFaz0PAI0kYphNpAf8D06yogp4v69hFYLXyB/7nK12Z8aSp0tPVmIz2JEZqlbrV43X kdfnVxOhHtvPIkaWn1/tbJglpAIB/SfsWRY32HVNSEt6gevHLMaSxSYyPwSVSyS9XK+l 5Hv1RUlO9KyCqo4133C8NVM7PbehIj7QUVeawN+aCm+Q0bf3M2wMvhxCnZpQONMWpMPP BuvAo7npTXY1z6z7T4kA7D59rtJaWkPShBJrhwJJcA6gzVurACB3t/UtkuwqgPxPOERd sZGbykYEhZOEyUeq7ebOIJZen5jNjUD2U8/lENPRm8eNULr0Mumg9WbiR1IW2uk4YN0i hC3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=VvY6frJ49pvErp8xA1UK8k5fiKnO3HYU4OQ817snyD0=; b=fiDphB08S0igx/ef/66XmFOpI0rs8QqRekfnNFHDyh8j0xh8JDkqXjdqGgtSOKa/+t MXCPvCvDxuhBeii6zjEuQ3jqMy4thWLCx8kul+ZkmYuavjmOHAZF4bm5xziofQ/CkRQg 2EeWYnqU4+7j02ues4SieBc6kkEjBpD819Kfdgxo82zbOizMFTqFBnPX+LueVL0Xeoh0 9TpsvuwBcDbkVAvP4ep+mWHENSLVYDkfPagscvE+nRRFM91s6LEGuF9PvBmsMq4439gq iY4kPb6CG+n4jkdFZaZELPX7QDhx+e0iGy535OoPVozFVyZ5Lv7YUF4FDNQlMJ2KFNX2 NHXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=bsVfadCg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w12si1076956otq.75.2020.03.26.07.32.41; Thu, 26 Mar 2020 07:32:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2020-01-29 header.b=bsVfadCg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728202AbgCZOcK (ORCPT + 99 others); Thu, 26 Mar 2020 10:32:10 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:35070 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727612AbgCZOcK (ORCPT ); Thu, 26 Mar 2020 10:32:10 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 02QETK8E147325; Thu, 26 Mar 2020 14:32:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2020-01-29; bh=VvY6frJ49pvErp8xA1UK8k5fiKnO3HYU4OQ817snyD0=; b=bsVfadCgvtQDpifCVJcHUeu7UbiKDZ5y/hRjvzdPMkbPewr7/X206MHlmx3xZPqVJXIc bEvXLjNhvCwo56/fomKUukaf+zKRnJP1/QQkvWk9gjc81+kDp10dZnafLMS19mbvDkBe czUjRkDLFSCGy1FNuDGaHfl7hzHeCdiAggh3xxFoSHduce/yS+amHCoAlU5BNkTNKEnt ncqSiKwdfDzBWgNnFQndWoekXGpn4xr5ZuIXv8aowOpQQOPXl7noAIeBEuUrO1WeOq31 wVTro3yD19k1FU9nYfuXI1l8RrvaLjt+WR+W2kAksMks64cTg6VKkTtMdGVUrNzF46pM YQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 2ywabrg5fe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:32:04 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 02QESWOR115608; Thu, 26 Mar 2020 14:32:03 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3030.oracle.com with ESMTP id 2yxw4trp7e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:32:03 +0000 Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 02QEW2fB029007; Thu, 26 Mar 2020 14:32:02 GMT Received: from localhost.uk.oracle.com (/10.175.198.205) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 26 Mar 2020 07:32:02 -0700 From: Alan Maguire To: brendanhiggins@google.com, frowand.list@gmail.com, gregkh@linuxfoundation.org, shuah@kernel.org, linux-kselftest@vger.kernel.org Cc: corbet@lwn.net, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-doc@vger.kernel.org Subject: [PATCH v8 kunit-next 2/4] kunit: add log test Date: Thu, 26 Mar 2020 14:25:08 +0000 Message-Id: <1585232710-322-3-git-send-email-alan.maguire@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1585232710-322-1-git-send-email-alan.maguire@oracle.com> References: <1585232710-322-1-git-send-email-alan.maguire@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9571 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2003260112 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9571 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 lowpriorityscore=0 malwarescore=0 phishscore=0 priorityscore=1501 clxscore=1015 adultscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2003260112 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org the logging test ensures multiple strings logged appear in the log string associated with the test when CONFIG_KUNIT_DEBUGFS is enabled. Signed-off-by: Alan Maguire Reviewed-by: Brendan Higgins Reviewed-by: Frank Rowand --- lib/kunit/kunit-test.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c index aceb5bf..4f3d36a 100644 --- a/lib/kunit/kunit-test.c +++ b/lib/kunit/kunit-test.c @@ -329,6 +329,44 @@ static void kunit_resource_test_exit(struct kunit *test) .exit = kunit_resource_test_exit, .test_cases = kunit_resource_test_cases, }; -kunit_test_suites(&kunit_try_catch_test_suite, &kunit_resource_test_suite); + +static void kunit_log_test(struct kunit *test); + +static struct kunit_case kunit_log_test_cases[] = { + KUNIT_CASE(kunit_log_test), + {} +}; + +static struct kunit_suite kunit_log_test_suite = { + .name = "kunit-log-test", + .test_cases = kunit_log_test_cases, +}; + +static void kunit_log_test(struct kunit *test) +{ + struct kunit_suite *suite = &kunit_log_test_suite; + + kunit_log(KERN_INFO, test, "put this in log."); + kunit_log(KERN_INFO, test, "this too."); + kunit_log(KERN_INFO, suite, "add to suite log."); + kunit_log(KERN_INFO, suite, "along with this."); + +#ifdef CONFIG_KUNIT_DEBUGFS + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, + strstr(test->log, "put this in log.")); + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, + strstr(test->log, "this too.")); + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, + strstr(suite->log, "add to suite log.")); + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, + strstr(suite->log, "along with this.")); +#else + KUNIT_EXPECT_PTR_EQ(test, test->log, (char *)NULL); + KUNIT_EXPECT_PTR_EQ(test, suite->log, (char *)NULL); +#endif +} + +kunit_test_suites(&kunit_try_catch_test_suite, &kunit_resource_test_suite, + &kunit_log_test_suite); MODULE_LICENSE("GPL v2"); -- 1.8.3.1