From: Brendan Higgins <brendanhiggins@google.com>
To: jdike@addtoit.com, richard@nod.at,
anton.ivanov@cambridgegreys.com, arnd@arndb.de,
keescook@chromium.org, skhan@linuxfoundation.org,
alan.maguire@oracle.com, yzaikin@google.com, davidgow@google.com,
akpm@linux-foundation.org, rppt@linux.ibm.com,
frowand.list@gmail.com
Cc: gregkh@linuxfoundation.org, sboyd@kernel.org,
logang@deltatee.com, mcgrof@kernel.org, knut.omang@oracle.com,
linux-um@lists.infradead.org, linux-arch@vger.kernel.org,
linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
Brendan Higgins <brendanhiggins@google.com>
Subject: [PATCH v1 6/7] kunit: Add 'kunit_shutdown' option
Date: Mon, 27 Jan 2020 23:20:01 -0800 [thread overview]
Message-ID: <20200128072002.79250-7-brendanhiggins@google.com> (raw)
In-Reply-To: <20200128072002.79250-1-brendanhiggins@google.com>
From: David Gow <davidgow@google.com>
Add a new kernel command-line option, 'kunit_shutdown', which allows the
user to specify that the kernel poweroff, halt, or reboot after
completing all KUnit tests; this is very handy for running KUnit tests
on UML or a VM so that the UML/VM process exits cleanly immediately
after running all tests without needing a special initramfs.
Signed-off-by: David Gow <davidgow@google.com>
Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
---
lib/kunit/executor.c | 20 ++++++++++++++++++++
tools/testing/kunit/kunit_kernel.py | 2 +-
tools/testing/kunit/kunit_parser.py | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index 7fd16feff157e..d3ec1265a72fd 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <kunit/test.h>
+#include <linux/reboot.h>
/*
* These symbols point to the .kunit_test_suites section and are defined in
@@ -11,6 +12,23 @@ extern struct kunit_suite * const * const __kunit_suites_end[];
#if IS_BUILTIN(CONFIG_KUNIT)
+static char *kunit_shutdown;
+core_param(kunit_shutdown, kunit_shutdown, charp, 0644);
+
+static void kunit_handle_shutdown(void)
+{
+ if (!kunit_shutdown)
+ return;
+
+ if (!strcmp(kunit_shutdown, "poweroff")) {
+ kernel_power_off();
+ } else if (!strcmp(kunit_shutdown, "halt")) {
+ kernel_halt();
+ } else if (!strcmp(kunit_shutdown, "reboot")) {
+ kernel_restart(NULL);
+ }
+}
+
static void kunit_print_tap_header(void)
{
struct kunit_suite * const * const *suites, * const *subsuite;
@@ -42,6 +60,8 @@ int kunit_run_all_tests(void)
}
}
+ kunit_handle_shutdown();
+
if (has_test_failed)
return -EFAULT;
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index cc5d844ecca13..43314aa537d30 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -141,7 +141,7 @@ class LinuxSourceTree(object):
return True
def run_kernel(self, args=[], timeout=None, build_dir=''):
- args.extend(['mem=256M'])
+ args.extend(['mem=256M', 'kunit_shutdown=halt'])
process = self._ops.linux_bin(args, timeout, build_dir)
with open(os.path.join(build_dir, 'test.log'), 'w') as f:
for line in process.stdout:
diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py
index 78b3bdd03b1e4..633811dd9bce8 100644
--- a/tools/testing/kunit/kunit_parser.py
+++ b/tools/testing/kunit/kunit_parser.py
@@ -48,7 +48,7 @@ class TestStatus(Enum):
FAILURE_TO_PARSE_TESTS = auto()
kunit_start_re = re.compile(r'^TAP version [0-9]+$')
-kunit_end_re = re.compile('List of all partitions:')
+kunit_end_re = re.compile(r'reboot: System halted')
def isolate_kunit_output(kernel_output):
started = False
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-01-28 7:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 7:19 [PATCH v1 0/7] kunit: create a centralized executor to dispatch all KUnit tests Brendan Higgins
2020-01-28 7:19 ` [PATCH v1 1/7] vmlinux.lds.h: add linker section for KUnit test suites Brendan Higgins
2020-01-28 7:19 ` [PATCH v1 2/7] arch: um: " Brendan Higgins
2020-01-28 7:19 ` [PATCH v1 3/7] kunit: test: create a single centralized executor for all tests Brendan Higgins
2020-01-29 6:38 ` Stephen Boyd
2020-01-28 7:19 ` [PATCH v1 4/7] init: main: add KUnit to kernel init Brendan Higgins
2020-01-29 6:38 ` Stephen Boyd
2020-01-30 22:50 ` Brendan Higgins
2020-01-28 7:20 ` [PATCH v1 5/7] kunit: test: add test plan to KUnit TAP format Brendan Higgins
2020-01-28 7:20 ` Brendan Higgins [this message]
2020-01-29 6:33 ` [PATCH v1 6/7] kunit: Add 'kunit_shutdown' option Stephen Boyd
2020-01-30 22:56 ` Brendan Higgins
2020-01-28 7:20 ` [PATCH v1 7/7] Documentation: Add kunit_shutdown to kernel-parameters.txt Brendan Higgins
2020-01-29 6:27 ` Stephen Boyd
2020-01-30 23: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=20200128072002.79250-7-brendanhiggins@google.com \
--to=brendanhiggins@google.com \
--cc=akpm@linux-foundation.org \
--cc=alan.maguire@oracle.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=arnd@arndb.de \
--cc=davidgow@google.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jdike@addtoit.com \
--cc=keescook@chromium.org \
--cc=knut.omang@oracle.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=logang@deltatee.com \
--cc=mcgrof@kernel.org \
--cc=richard@nod.at \
--cc=rppt@linux.ibm.com \
--cc=sboyd@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=yzaikin@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).