subject:"\[U\-Boot\] \[PATCH 09\/13\] log\: Add a test command"

Re: [U-Boot] [PATCH 09/13] log: Add a test command

2017-09-17 Thread Bin Meng

Hi Simon,

On Sun, Sep 17, 2017 at 5:23 AM, Simon Glass  wrote:
> Add a command which exercises the logging system.
>
> Signed-off-by: Simon Glass 
> ---
>
>  cmd/Kconfig |   3 +-
>  cmd/log.c   |   6 ++
>  common/Kconfig  |  10 +++
>  include/log.h   |   3 +
>  test/Makefile   |   1 +
>  test/log/Makefile   |   7 ++
>  test/log/log_test.c | 204 
> 
>  7 files changed, 233 insertions(+), 1 deletion(-)
>  create mode 100644 test/log/Makefile
>  create mode 100644 test/log/log_test.c
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 702d4f251f..9d52e4fecc 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1483,7 +1483,8 @@ config CMD_LOG
> help
>   This provides access to logging features. It allows the output of
>   log data to be controlled to a limited extent (setting up the 
> default
> - maximum log level for emitting of records).
> + maximum log level for emitting of records). It also provides access
> + to a command used for testing the log system.
>
>  config CMD_TRACE
> bool "trace - Support tracing of function calls and timing"
> diff --git a/cmd/log.c b/cmd/log.c
> index 44e04ab16a..1fc49c4cf2 100644
> --- a/cmd/log.c
> +++ b/cmd/log.c
> @@ -23,6 +23,9 @@ static int do_log_level(cmd_tbl_t *cmdtp, int flag, int 
> argc,
>
>  static cmd_tbl_t log_sub[] = {
> U_BOOT_CMD_MKENT(level, CONFIG_SYS_MAXARGS, 1, do_log_level, "", ""),
> +#ifdef CONFIG_LOG_TEST
> +   U_BOOT_CMD_MKENT(test, 2, 1, do_log_level, "", ""),

It should be "do_log_test".

> +#endif
>  };
>
>  static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
> @@ -46,6 +49,9 @@ static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, 
> char * const argv[])
>  #ifdef CONFIG_SYS_LONGHELP
>  static char log_help_text[] =
> "level - get/set log level\n"
> +#ifdef CONFIG_LOG_TEST
> +   "test - run log tests\n"

It should be "log test", as U-Boot's command line won't append the
main command name except the first one.

> +#endif
> ;
>  #endif
>
> diff --git a/common/Kconfig b/common/Kconfig
> index ba4578e870..57ce2cbe9a 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -458,6 +458,16 @@ config LOG_SPL_CONSOLE
>   log message is shown - other details like level, category, file and
>   line number are omitted.
>
> +config LOG_TEST
> +   bool "Provide a test for logging"
> +   depends on LOG
> +   default y if SANDBOX
> +   help
> + This enables a 'log test' command to test logging. It is normally
> + executed from a pytest and simply outputs logging information
> + in various different ways to test that the logging system works
> + correctly with varoius settings.
> +
>  endmenu
>
>  config DTB_RESELECT
> diff --git a/include/log.h b/include/log.h
> index fb6a196202..f03ed94128 100644
> --- a/include/log.h
> +++ b/include/log.h
> @@ -263,6 +263,9 @@ struct log_filter {
>  #define LOG_DRIVER(_name) \
> ll_entry_declare(struct log_driver, _name, log_driver)
>
> +/* Handle the 'log test' command */
> +int do_log_test(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
> +
>  /**
>   * log_add_filter() - Add a new filter to a log device
>   *
> diff --git a/test/Makefile b/test/Makefile
> index 6305afb211..40f2244b79 100644
> --- a/test/Makefile
> +++ b/test/Makefile
> @@ -10,3 +10,4 @@ obj-$(CONFIG_SANDBOX) += command_ut.o
>  obj-$(CONFIG_SANDBOX) += compression.o
>  obj-$(CONFIG_SANDBOX) += print_ut.o
>  obj-$(CONFIG_UT_TIME) += time_ut.o
> +obj-$(CONFIG_$(SPL_)LOG) += log/
> diff --git a/test/log/Makefile b/test/log/Makefile
> new file mode 100644
> index 00..b0da8dee28
> --- /dev/null
> +++ b/test/log/Makefile
> @@ -0,0 +1,7 @@
> +#
> +# Copyright (c) 2017 Google, Inc
> +#
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +
> +obj-$(CONFIG_LOG_TEST) += log_test.o
> diff --git a/test/log/log_test.c b/test/log/log_test.c
> new file mode 100644
> index 00..c3d076491f
> --- /dev/null
> +++ b/test/log/log_test.c
> @@ -0,0 +1,204 @@
> +/*
> + * Logging support test program
> + *
> + * Copyright (c) 2017 Google, Inc
> + * Written by Simon Glass 
> + *
> + * SPDX-License-Identifier:GPL-2.0+
> + */
> +
> +#include 
> +
> +/* emit some sample log records in different ways, for testing */
> +static int log_run(enum log_category_t cat, const char *file)
> +{
> +   int i;
> +
> +   debug("debug\n");
> +   error("error\n");
> +   for (i = LOGL_FIRST; i < LOGL_COUNT; i++) {
> +   log(cat, i, "log %d\n", i);
> +   _log(cat, i, file, 100 + i, "func", "_log %d\n", i);
> +   }
> +
> +   return 0;
> +}
> +
> +static int log_test(int testnum)
> +{
> +   int ret;
> +
> +   printf("test %d\n", testnum);
> +   switch (testnum) {
> +   case 0: {
> +

[U-Boot] [PATCH 09/13] log: Add a test command

2017-09-16 Thread Simon Glass

Add a command which exercises the logging system.

Signed-off-by: Simon Glass 
---

 cmd/Kconfig |   3 +-
 cmd/log.c   |   6 ++
 common/Kconfig  |  10 +++
 include/log.h   |   3 +
 test/Makefile   |   1 +
 test/log/Makefile   |   7 ++
 test/log/log_test.c | 204 
 7 files changed, 233 insertions(+), 1 deletion(-)
 create mode 100644 test/log/Makefile
 create mode 100644 test/log/log_test.c

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 702d4f251f..9d52e4fecc 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1483,7 +1483,8 @@ config CMD_LOG
help
  This provides access to logging features. It allows the output of
  log data to be controlled to a limited extent (setting up the default
- maximum log level for emitting of records).
+ maximum log level for emitting of records). It also provides access
+ to a command used for testing the log system.
 
 config CMD_TRACE
bool "trace - Support tracing of function calls and timing"
diff --git a/cmd/log.c b/cmd/log.c
index 44e04ab16a..1fc49c4cf2 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -23,6 +23,9 @@ static int do_log_level(cmd_tbl_t *cmdtp, int flag, int argc,
 
 static cmd_tbl_t log_sub[] = {
U_BOOT_CMD_MKENT(level, CONFIG_SYS_MAXARGS, 1, do_log_level, "", ""),
+#ifdef CONFIG_LOG_TEST
+   U_BOOT_CMD_MKENT(test, 2, 1, do_log_level, "", ""),
+#endif
 };
 
 static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -46,6 +49,9 @@ static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char 
* const argv[])
 #ifdef CONFIG_SYS_LONGHELP
 static char log_help_text[] =
"level - get/set log level\n"
+#ifdef CONFIG_LOG_TEST
+   "test - run log tests\n"
+#endif
;
 #endif
 
diff --git a/common/Kconfig b/common/Kconfig
index ba4578e870..57ce2cbe9a 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -458,6 +458,16 @@ config LOG_SPL_CONSOLE
  log message is shown - other details like level, category, file and
  line number are omitted.
 
+config LOG_TEST
+   bool "Provide a test for logging"
+   depends on LOG
+   default y if SANDBOX
+   help
+ This enables a 'log test' command to test logging. It is normally
+ executed from a pytest and simply outputs logging information
+ in various different ways to test that the logging system works
+ correctly with varoius settings.
+
 endmenu
 
 config DTB_RESELECT
diff --git a/include/log.h b/include/log.h
index fb6a196202..f03ed94128 100644
--- a/include/log.h
+++ b/include/log.h
@@ -263,6 +263,9 @@ struct log_filter {
 #define LOG_DRIVER(_name) \
ll_entry_declare(struct log_driver, _name, log_driver)
 
+/* Handle the 'log test' command */
+int do_log_test(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]);
+
 /**
  * log_add_filter() - Add a new filter to a log device
  *
diff --git a/test/Makefile b/test/Makefile
index 6305afb211..40f2244b79 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_SANDBOX) += command_ut.o
 obj-$(CONFIG_SANDBOX) += compression.o
 obj-$(CONFIG_SANDBOX) += print_ut.o
 obj-$(CONFIG_UT_TIME) += time_ut.o
+obj-$(CONFIG_$(SPL_)LOG) += log/
diff --git a/test/log/Makefile b/test/log/Makefile
new file mode 100644
index 00..b0da8dee28
--- /dev/null
+++ b/test/log/Makefile
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2017 Google, Inc
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-$(CONFIG_LOG_TEST) += log_test.o
diff --git a/test/log/log_test.c b/test/log/log_test.c
new file mode 100644
index 00..c3d076491f
--- /dev/null
+++ b/test/log/log_test.c
@@ -0,0 +1,204 @@
+/*
+ * Logging support test program
+ *
+ * Copyright (c) 2017 Google, Inc
+ * Written by Simon Glass 
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include 
+
+/* emit some sample log records in different ways, for testing */
+static int log_run(enum log_category_t cat, const char *file)
+{
+   int i;
+
+   debug("debug\n");
+   error("error\n");
+   for (i = LOGL_FIRST; i < LOGL_COUNT; i++) {
+   log(cat, i, "log %d\n", i);
+   _log(cat, i, file, 100 + i, "func", "_log %d\n", i);
+   }
+
+   return 0;
+}
+
+static int log_test(int testnum)
+{
+   int ret;
+
+   printf("test %d\n", testnum);
+   switch (testnum) {
+   case 0: {
+   /* Check a category filter using the first category */
+   enum log_category_t cat_list[] = {
+   UCLASS_MMC, UCLASS_SPI, LOGC_NONE, LOGC_END
+   };
+
+   ret = log_add_filter("console", cat_list, LOGL_MAX, NULL);
+   if (ret < 0)
+   return ret;
+   log_run(UCLASS_MMC, "file");
+   ret = log_remove_filter("console", ret);
+   if (ret < 0)
+   return ret;
+

Re: [U-Boot] [PATCH 09/13] log: Add a test command

[U-Boot] [PATCH 09/13] log: Add a test command

2 matches

Site Navigation

Mail list logo

Footer information