From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v3 11/23] test: Add tests for LOGFF_DENY
Date: Sat, 17 Oct 2020 14:07:36 -0400 [thread overview]
Message-ID: <20201017180749.119271-12-seanga2@gmail.com> (raw)
In-Reply-To: <20201017180749.119271-1-seanga2@gmail.com>
This adds some tests for log filters which deny if they match.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
Changes in v3:
- Modified to be completely written in C
test/log/log_test.c | 67 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/test/log/log_test.c b/test/log/log_test.c
index 4ac378fdad..e4ab999a7d 100644
--- a/test/log/log_test.c
+++ b/test/log/log_test.c
@@ -292,3 +292,70 @@ int log_test_disable(struct unit_test_state *uts)
return ret;
}
LOG_TEST_FLAGS(log_test_disable, UT_TESTF_CONSOLE_REC);
+
+/* Check denying based on category */
+int log_test_cat_deny(struct unit_test_state *uts)
+{
+ int filt1, filt2;
+ enum log_category_t cat_list[] = {
+ log_uc_cat(UCLASS_SPI), LOGC_END
+ };
+
+ filt1 = log_add_filter("console", cat_list, LOGL_MAX, NULL);
+ ut_assert(filt1 >= 0);
+ filt2 = log_add_filter_flags("console", cat_list, LOGL_MAX, NULL,
+ LOGFF_DENY);
+ ut_assert(filt2 >= 0);
+
+ ut_assertok(console_record_reset_enable());
+ log_run_cat(UCLASS_SPI);
+ check_log_entries_none();
+
+ ut_assertok(log_remove_filter("console", filt1));
+ ut_assertok(log_remove_filter("console", filt2));
+ return 0;
+}
+LOG_TEST_FLAGS(log_test_cat_deny, UT_TESTF_CONSOLE_REC);
+
+/* Check denying based on file */
+int log_test_file_deny(struct unit_test_state *uts)
+{
+ int filt1, filt2;
+
+ filt1 = log_add_filter("console", NULL, LOGL_MAX, "file");
+ ut_assert(filt1 >= 0);
+ filt2 = log_add_filter_flags("console", NULL, LOGL_MAX, "file",
+ LOGFF_DENY);
+ ut_assert(filt2 >= 0);
+
+ ut_assertok(console_record_reset_enable());
+ log_run_file("file");
+ check_log_entries_none();
+
+ ut_assertok(log_remove_filter("console", filt1));
+ ut_assertok(log_remove_filter("console", filt2));
+ return 0;
+}
+LOG_TEST_FLAGS(log_test_file_deny, UT_TESTF_CONSOLE_REC);
+
+/* Check denying based on level */
+int log_test_level_deny(struct unit_test_state *uts)
+{
+ int filt1, filt2;
+
+ filt1 = log_add_filter("console", NULL, LOGL_INFO, NULL);
+ ut_assert(filt1 >= 0);
+ filt2 = log_add_filter_flags("console", NULL, LOGL_WARNING, NULL,
+ LOGFF_DENY);
+ ut_assert(filt2 >= 0);
+
+ ut_assertok(console_record_reset_enable());
+ log_run();
+ check_log_entries_flags_levels(EXPECT_LOG | EXPECT_DIRECT,
+ LOGL_WARNING + 1, _LOG_MAX_LEVEL);
+
+ ut_assertok(log_remove_filter("console", filt1));
+ ut_assertok(log_remove_filter("console", filt2));
+ return 0;
+}
+LOG_TEST_FLAGS(log_test_level_deny, UT_TESTF_CONSOLE_REC);
--
2.28.0
next prev parent reply other threads:[~2020-10-17 18:07 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-17 18:07 [PATCH v3 00/23] log: Add commands for manipulating filters Sean Anderson
2020-10-17 18:07 ` [PATCH v3 01/23] log: Fix missing negation of ENOMEM Sean Anderson
2020-10-17 18:07 ` [PATCH v3 02/23] log: Fix incorrect documentation of log_filter.cat_list Sean Anderson
2020-10-17 18:07 ` [PATCH v3 03/23] log: Add additional const qualifier to arrays Sean Anderson
2020-10-17 18:07 ` [PATCH v3 04/23] log: Add new category names to log_cat_name Sean Anderson
2020-10-27 17:45 ` Tom Rini
2020-10-27 18:07 ` Sean Anderson
2020-10-27 18:08 ` Tom Rini
2020-10-17 18:07 ` [PATCH v3 05/23] log: Use CONFIG_IS_ENABLED() for LOG_TEST Sean Anderson
2020-10-17 18:07 ` [PATCH v3 06/23] log: Expose some helper functions Sean Anderson
2020-10-17 18:07 ` [PATCH v3 07/23] log: Add function to create a filter with flags Sean Anderson
2020-10-17 18:07 ` [PATCH v3 08/23] log: Add filter flag to deny on match Sean Anderson
2020-10-17 18:07 ` [PATCH v3 09/23] test: log: Convert log_test from python to C Sean Anderson
2020-11-03 15:11 ` Simon Glass
2020-10-17 18:07 ` [PATCH v3 10/23] test: log: Give tests names instead of numbers Sean Anderson
2020-11-03 15:11 ` Simon Glass
2020-10-17 18:07 ` Sean Anderson [this message]
2020-10-17 18:07 ` [PATCH v3 12/23] log: Add filter flag to match greater than a log level Sean Anderson
2020-10-17 18:07 ` [PATCH v3 13/23] test: Add test for LOGFF_MIN Sean Anderson
2020-10-17 18:07 ` [PATCH v3 14/23] cmd: log: Use sub-commands for log Sean Anderson
2020-10-17 18:07 ` [PATCH v3 15/23] cmd: log: Split off log level parsing Sean Anderson
2020-10-17 18:07 ` [PATCH v3 16/23] cmd: log: Add commands to list categories and drivers Sean Anderson
2020-10-17 18:07 ` [PATCH v3 17/23] cmd: log: Make "log level" print all log levels Sean Anderson
2020-10-17 18:07 ` [PATCH v3 18/23] lib: Add getopt Sean Anderson
2020-11-03 15:11 ` Simon Glass
2020-10-17 18:07 ` [PATCH v3 19/23] test: Add a test for getopt Sean Anderson
2020-11-03 15:11 ` Simon Glass
2020-10-17 18:07 ` [PATCH v3 20/23] cmd: log: Add commands to manipulate filters Sean Anderson
2020-10-17 18:07 ` [PATCH v3 21/23] test: Add a test for log filter-* Sean Anderson
2020-10-27 21:00 ` Tom Rini
2020-10-27 21:11 ` Sean Anderson
2020-10-27 21:12 ` Tom Rini
2020-10-17 18:07 ` [PATCH v3 22/23] doc: Add log kerneldocs to documentation Sean Anderson
2020-10-17 18:07 ` [PATCH v3 23/23] doc: Update logging documentation Sean Anderson
2020-10-27 20:58 ` Tom Rini
2020-10-27 21:00 ` Heinrich Schuchardt
2020-10-27 21:11 ` Sean Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201017180749.119271-12-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox