From: brendanhiggins@google.com (Brendan Higgins)
Subject: [RFC v3 13/19] kunit: improve output from python wrapper
Date: Wed, 28 Nov 2018 11:36:30 -0800 [thread overview]
Message-ID: <20181128193636.254378-14-brendanhiggins@google.com> (raw)
Message-ID: <20181128193630.91aiVv5n-7PaLzW06iwtwZZkkEkovs-OYIJxpPiPv14@z> (raw)
In-Reply-To: <20181128193636.254378-1-brendanhiggins@google.com>
- add colors to displayed output
- add timing and summary
Signed-off-by: Felix Guo <felixguoxiuping at gmail.com>
Signed-off-by: Brendan Higgins <brendanhiggins at google.com>
---
tools/testing/kunit/kunit.py | 27 ++++++++-
tools/testing/kunit/kunit_parser.py | 93 ++++++++++++++++++++++++++++-
2 files changed, 115 insertions(+), 5 deletions(-)
diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index 1356be404996b..0b8e8c20a746e 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -6,6 +6,7 @@
import argparse
import sys
import os
+import time
import kunit_config
import kunit_kernel
@@ -21,20 +22,40 @@ parser.add_argument('--timeout', help='maximum number of seconds to allow for '
'build the tests.', type=int, default=300,
metavar='timeout')
+parser.add_argument('--jobs',
+ help='As in the make command, "Specifies the number of '
+ 'jobs (commands) to run simultaneously."',
+ type=int, default=8, metavar='jobs')
+
cli_args = parser.parse_args()
linux = kunit_kernel.LinuxSourceTree()
+config_start = time.time()
success = linux.build_reconfig()
+config_end = time.time()
if not success:
quit()
-print('Building KUnit Kernel ...')
-success = linux.build_um_kernel()
+kunit_parser.print_with_timestamp('Building KUnit Kernel ...')
+
+build_start = time.time()
+success = linux.build_um_kernel(jobs=cli_args.jobs)
+build_end = time.time()
if not success:
quit()
-print('Starting KUnit Kernel ...')
+kunit_parser.print_with_timestamp('Starting KUnit Kernel ...')
+test_start = time.time()
+
if cli_args.raw_output:
kunit_parser.raw_output(linux.run_kernel(timeout=cli_args.timeout))
else:
kunit_parser.parse_run_tests(linux.run_kernel(timeout=cli_args.timeout))
+
+test_end = time.time()
+
+kunit_parser.print_with_timestamp((
+ "Elapsed time: %.3fs total, %.3fs configuring, %.3fs " +
+ "building, %.3fs running.\n") % (test_end - config_start,
+ config_end - config_start, build_end - build_start,
+ test_end - test_start))
diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py
index 1dff3adb73bd3..d9051e407d5a7 100644
--- a/tools/testing/kunit/kunit_parser.py
+++ b/tools/testing/kunit/kunit_parser.py
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
import re
+from datetime import datetime
kunit_start_re = re.compile('console .* enabled')
kunit_end_re = re.compile('List of all partitions:')
@@ -19,6 +20,94 @@ def raw_output(kernel_output):
for line in kernel_output:
print(line)
+DIVIDER = "=" * 30
+
+RESET = '\033[0;0m'
+
+def red(text):
+ return '\033[1;31m' + text + RESET
+
+def yellow(text):
+ return '\033[1;33m' + text + RESET
+
+def green(text):
+ return '\033[1;32m' + text + RESET
+
+def print_with_timestamp(message):
+ print('[%s] %s' % (datetime.now().strftime('%H:%M:%S'), message))
+
+def print_log(log):
+ for m in log:
+ print_with_timestamp(m)
+
def parse_run_tests(kernel_output):
- for output in isolate_kunit_output(kernel_output):
- print(output)
+ test_case_output = re.compile('^kunit .*?: (.*)$')
+
+ test_module_success = re.compile('^kunit .*: all tests passed')
+ test_module_fail = re.compile('^kunit .*: one or more tests failed')
+
+ test_case_success = re.compile('^kunit (.*): (.*) passed')
+ test_case_fail = re.compile('^kunit (.*): (.*) failed')
+ test_case_crash = re.compile('^kunit (.*): (.*) crashed')
+
+ total_tests = set()
+ failed_tests = set()
+ crashed_tests = set()
+
+ def get_test_name(match):
+ return match.group(1) + ":" + match.group(2)
+
+ current_case_log = []
+ def end_one_test(match, log):
+ log.clear()
+ total_tests.add(get_test_name(match))
+
+ print_with_timestamp(DIVIDER)
+ for line in isolate_kunit_output(kernel_output):
+ # Ignore module output:
+ if (test_module_success.match(line) or
+ test_module_fail.match(line)):
+ print_with_timestamp(DIVIDER)
+ continue
+
+ match = re.match(test_case_success, line)
+ if match:
+ print_with_timestamp(green("[PASSED] ") +
+ get_test_name(match))
+ end_one_test(match, current_case_log)
+ continue
+
+ match = re.match(test_case_fail, line)
+ # Crashed tests will report as both failed and crashed. We only
+ # want to show and count it once.
+ if match and get_test_name(match) not in crashed_tests:
+ failed_tests.add(get_test_name(match))
+ print_with_timestamp(red("[FAILED] " +
+ get_test_name(match)))
+ print_log(map(yellow, current_case_log))
+ print_with_timestamp("")
+ end_one_test(match, current_case_log)
+ continue
+
+ match = re.match(test_case_crash, line)
+ if match:
+ crashed_tests.add(get_test_name(match))
+ print_with_timestamp(yellow("[CRASH] " +
+ get_test_name(match)))
+ print_log(current_case_log)
+ print_with_timestamp("")
+ end_one_test(match, current_case_log)
+ continue
+
+ # Strip off the `kunit module-name:` prefix
+ match = re.match(test_case_output, line)
+ if match:
+ current_case_log.append(match.group(1))
+ else:
+ current_case_log.append(line)
+
+ fmt = green if (len(failed_tests) + len(crashed_tests) == 0) else red
+ print_with_timestamp(
+ fmt("Testing complete. %d tests run. %d failed. %d crashed." %
+ (len(total_tests), len(failed_tests), len(crashed_tests))))
+
--
2.20.0.rc0.387.gc7a69e6b6c-goog
next prev parent reply other threads:[~2018-11-28 19:36 UTC|newest]
Thread overview: 232+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-28 19:36 [RFC v3 00/19] kunit: introduce KUnit, the Linux kernel unit testing framework brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 01/19] kunit: test: add KUnit test runner core brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:14 ` mcgrof
2018-11-30 3:14 ` Luis Chamberlain
2018-12-01 1:51 ` brendanhiggins
2018-12-01 1:51 ` Brendan Higgins
2018-12-01 2:57 ` mcgrof
2018-12-01 2:57 ` Luis Chamberlain
2018-12-05 13:15 ` anton.ivanov
2018-12-05 13:15 ` Anton Ivanov
2018-12-05 14:45 ` arnd
2018-12-05 14:45 ` Arnd Bergmann
2018-12-05 14:49 ` anton.ivanov
2018-12-05 14:49 ` Anton Ivanov
2018-11-30 3:28 ` mcgrof
2018-11-30 3:28 ` Luis Chamberlain
2018-12-01 2:08 ` brendanhiggins
2018-12-01 2:08 ` Brendan Higgins
2018-12-01 3:10 ` mcgrof
2018-12-01 3:10 ` Luis Chamberlain
2018-12-03 22:47 ` brendanhiggins
2018-12-03 22:47 ` Brendan Higgins
2018-12-01 3:02 ` mcgrof
2018-12-01 3:02 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 02/19] kunit: test: add test resource management API brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 03/19] kunit: test: add string_stream a std::stream like string builder brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:29 ` mcgrof
2018-11-30 3:29 ` Luis Chamberlain
2018-12-01 2:14 ` brendanhiggins
2018-12-01 2:14 ` Brendan Higgins
2018-12-01 3:12 ` mcgrof
2018-12-01 3:12 ` Luis Chamberlain
2018-12-03 10:55 ` pmladek
2018-12-03 10:55 ` Petr Mladek
2018-12-04 0:35 ` brendanhiggins
2018-12-04 0:35 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 04/19] kunit: test: add test_stream a std::stream like logger brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 05/19] kunit: test: add the concept of expectations brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 06/19] arch: um: enable running kunit from User Mode Linux brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 21:26 ` robh
2018-11-28 21:26 ` Rob Herring
2018-11-30 3:37 ` mcgrof
2018-11-30 3:37 ` Luis Chamberlain
2018-11-30 14:05 ` robh
2018-11-30 14:05 ` Rob Herring
2018-11-30 18:22 ` mcgrof
2018-11-30 18:22 ` Luis Chamberlain
2018-12-03 23:22 ` brendanhiggins
2018-12-03 23:22 ` Brendan Higgins
2018-11-30 3:30 ` mcgrof
2018-11-30 3:30 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 07/19] kunit: test: add initial tests brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:40 ` mcgrof
2018-11-30 3:40 ` Luis Chamberlain
2018-12-03 23:26 ` brendanhiggins
2018-12-03 23:26 ` Brendan Higgins
2018-12-03 23:43 ` mcgrof
2018-12-03 23:43 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 08/19] arch: um: add shim to trap to allow installing a fault catcher for tests brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-30 3:34 ` mcgrof
2018-11-30 3:34 ` Luis Chamberlain
2018-12-03 23:34 ` brendanhiggins
2018-12-03 23:34 ` Brendan Higgins
2018-12-03 23:46 ` mcgrof
2018-12-03 23:46 ` Luis Chamberlain
2018-12-04 0:44 ` brendanhiggins
2018-12-04 0:44 ` Brendan Higgins
2018-11-30 3:41 ` mcgrof
2018-11-30 3:41 ` Luis Chamberlain
2018-12-03 23:37 ` brendanhiggins
2018-12-03 23:37 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 09/19] kunit: test: add the concept of assertions brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 10/19] kunit: test: add test managed resource tests brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 11/19] kunit: add Python libraries for handing KUnit config and kernel brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-29 13:54 ` kieran.bingham
2018-11-29 13:54 ` Kieran Bingham
2018-12-03 23:48 ` brendanhiggins
2018-12-03 23:48 ` Brendan Higgins
2018-12-04 20:47 ` mcgrof
2018-12-04 20:47 ` Luis Chamberlain
2018-12-06 12:32 ` kieran.bingham
2018-12-06 12:32 ` Kieran Bingham
2018-12-06 15:37 ` willy
2018-12-06 15:37 ` Matthew Wilcox
2018-12-07 11:30 ` kieran.bingham
2018-12-07 11:30 ` Kieran Bingham
2018-12-11 14:09 ` pmladek
2018-12-11 14:09 ` Petr Mladek
2018-12-11 14:41 ` rostedt
2018-12-11 14:41 ` Steven Rostedt
2018-12-11 17:01 ` anton.ivanov
2018-12-11 17:01 ` Anton Ivanov
2019-02-09 0:40 ` brendanhiggins
2019-02-09 0:40 ` Brendan Higgins
2018-12-07 1:05 ` mcgrof
2018-12-07 1:05 ` Luis Chamberlain
2018-12-07 18:35 ` kent.overstreet
2018-12-07 18:35 ` Kent Overstreet
2018-11-30 3:44 ` mcgrof
2018-11-30 3:44 ` Luis Chamberlain
2018-12-03 23:50 ` brendanhiggins
2018-12-03 23:50 ` Brendan Higgins
2018-12-04 20:48 ` mcgrof
2018-12-04 20:48 ` Luis Chamberlain
2018-11-28 19:36 ` [RFC v3 12/19] kunit: add KUnit wrapper script and simple output parser brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` brendanhiggins [this message]
2018-11-28 19:36 ` [RFC v3 13/19] kunit: improve output from python wrapper Brendan Higgins
2018-11-28 19:36 ` [RFC v3 14/19] Documentation: kunit: add documentation for KUnit brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-29 13:56 ` kieran.bingham
2018-11-29 13:56 ` Kieran Bingham
2018-11-30 3:45 ` mcgrof
2018-11-30 3:45 ` Luis Chamberlain
2018-12-03 23:53 ` brendanhiggins
2018-12-03 23:53 ` Brendan Higgins
2018-12-06 12:16 ` kieran.bingham
2018-12-06 12:16 ` Kieran Bingham
2019-02-09 0:56 ` brendanhiggins
2019-02-09 0:56 ` Brendan Higgins
2019-02-11 12:16 ` kieran.bingham
2019-02-11 12:16 ` Kieran Bingham
2019-02-12 22:10 ` brendanhiggins
2019-02-12 22:10 ` Brendan Higgins
2019-02-13 21:55 ` kieran.bingham
2019-02-13 21:55 ` Kieran Bingham
2019-02-14 0:17 ` brendanhiggins
2019-02-14 0:17 ` Brendan Higgins
2019-02-14 17:26 ` mcgrof
2019-02-14 17:26 ` Luis Chamberlain
2019-02-14 22:07 ` brendanhiggins
2019-02-14 22:07 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 15/19] MAINTAINERS: add entry for KUnit the unit testing framework brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 16/19] arch: um: make UML unflatten device tree when testing brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-11-28 21:16 ` robh
2018-11-28 21:16 ` Rob Herring
2018-12-04 0:00 ` brendanhiggins
2018-12-04 0:00 ` Brendan Higgins
2018-11-30 3:46 ` mcgrof
2018-11-30 3:46 ` Luis Chamberlain
2018-12-04 0:02 ` brendanhiggins
2018-12-04 0:02 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 17/19] of: unittest: migrate tests to run on KUnit brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
[not found] ` <CAL_Jsq+09Kx7yMBC_Jw45QGmk6U_fp4N6HOZDwYrM4tWw+_dOA@mail.gmail.com>
2018-11-30 0:39 ` rdunlap
2018-11-30 0:39 ` Randy Dunlap
2018-12-04 0:13 ` brendanhiggins
2018-12-04 0:13 ` Brendan Higgins
2018-12-04 13:40 ` robh
2018-12-04 13:40 ` Rob Herring
2018-12-05 23:42 ` brendanhiggins
2018-12-05 23:42 ` Brendan Higgins
2018-12-07 0:41 ` robh
2018-12-07 0:41 ` Rob Herring
2018-12-04 0:08 ` brendanhiggins
2018-12-04 0:08 ` Brendan Higgins
2019-02-13 1:44 ` brendanhiggins
2019-02-13 1:44 ` Brendan Higgins
2019-02-14 20:10 ` robh
2019-02-14 20:10 ` Rob Herring
2019-02-14 21:52 ` brendanhiggins
2019-02-14 21:52 ` Brendan Higgins
2019-02-18 22:56 ` frowand.list
2019-02-18 22:56 ` Frank Rowand
2019-02-28 0:29 ` brendanhiggins
2019-02-28 0:29 ` Brendan Higgins
2018-12-04 10:56 ` frowand.list
2018-12-04 10:56 ` Frank Rowand
2018-11-28 19:36 ` [RFC v3 18/19] of: unittest: split out a couple of test cases from unittest brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-12-04 10:58 ` frowand.list
2018-12-04 10:58 ` Frank Rowand
2018-12-05 23:54 ` brendanhiggins
2018-12-05 23:54 ` Brendan Higgins
2019-02-14 23:57 ` frowand.list
2019-02-14 23:57 ` Frank Rowand
2019-02-15 0:56 ` brendanhiggins
2019-02-15 0:56 ` Brendan Higgins
2019-02-15 2:05 ` frowand.list
2019-02-15 2:05 ` Frank Rowand
2019-02-15 10:56 ` brendanhiggins
2019-02-15 10:56 ` Brendan Higgins
2019-02-18 22:25 ` frowand.list
2019-02-18 22:25 ` Frank Rowand
2019-02-20 20:44 ` frowand.list
2019-02-20 20:44 ` Frank Rowand
2019-02-20 20:47 ` frowand.list
2019-02-20 20:47 ` Frank Rowand
2019-02-28 3:52 ` brendanhiggins
2019-02-28 3:52 ` Brendan Higgins
2019-03-22 0:22 ` frowand.list
2019-03-22 0:22 ` Frank Rowand
2019-03-22 1:30 ` brendanhiggins
2019-03-22 1:30 ` Brendan Higgins
2019-03-22 1:47 ` frowand.list
2019-03-22 1:47 ` Frank Rowand
2019-03-25 22:15 ` brendanhiggins
2019-03-25 22:15 ` Brendan Higgins
2019-09-20 16:57 ` Rob Herring
2019-09-21 23:57 ` Frank Rowand
2019-03-22 1:34 ` frowand.list
2019-03-22 1:34 ` Frank Rowand
2019-03-25 22:18 ` brendanhiggins
2019-03-25 22:18 ` Brendan Higgins
2018-11-28 19:36 ` [RFC v3 19/19] of: unittest: split up some super large test cases brendanhiggins
2018-11-28 19:36 ` Brendan Higgins
2018-12-04 10:52 ` [RFC v3 00/19] kunit: introduce KUnit, the Linux kernel unit testing framework frowand.list
2018-12-04 10:52 ` Frank Rowand
2018-12-04 11:40 ` frowand.list
2018-12-04 11:40 ` Frank Rowand
2018-12-04 13:49 ` robh
2018-12-04 13:49 ` Rob Herring
2018-12-05 23:10 ` brendanhiggins
2018-12-05 23:10 ` Brendan Higgins
2019-03-22 0:27 ` frowand.list
2019-03-22 0:27 ` Frank Rowand
2019-03-25 22:04 ` brendanhiggins
2019-03-25 22:04 ` Brendan Higgins
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=20181128193636.254378-14-brendanhiggins@google.com \
--to=brendanhiggins@google.com \
/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;
as well as URLs for NNTP newsgroup(s).