lkml.org 
[lkml]   [2019]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[RFC v1 6/6] kunit: Add 'kunit_shutdown' option
From
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 | 18 ++++++++++++++++++
tools/testing/kunit/kunit_kernel.py | 2 +-
tools/testing/kunit/kunit_parser.py | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/kunit/executor.c b/lib/kunit/executor.c
index d5f1d07f2f817..32462ecb94eb6 100644
--- a/lib/kunit/executor.c
+++ b/lib/kunit/executor.c
@@ -7,7 +7,9 @@
*/

#include <linux/init.h>
+#include <linux/moduleparam.h>
#include <linux/printk.h>
+#include <linux/reboot.h>
#include <kunit/test.h>

/*
@@ -17,6 +19,9 @@
extern struct kunit_suite *__kunit_suites_start[];
extern struct kunit_suite *__kunit_suites_end[];

+static char *kunit_shutdown;
+core_param(kunit_shutdown, kunit_shutdown, charp, 0644);
+
static void kunit_print_tap_header(void)
{
size_t num_of_suites;
@@ -30,6 +35,17 @@ static void kunit_print_tap_header(void)
pr_info("1..%zd\n", num_of_suites);
}

+static void kunit_handle_shutdown(void)
+{
+ 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 bool kunit_run_all_tests(void)
{
struct kunit_suite **suite;
@@ -44,6 +60,8 @@ static bool kunit_run_all_tests(void)
has_test_failed = true;
}

+ kunit_handle_shutdown();
+
return !has_test_failed;
}

diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index bf38768353313..0070c6b807d2a 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=None):
- args.extend(['mem=256M'])
+ args.extend(['mem=256M', 'kunit_shutdown=halt'])
process = self._ops.linux_bin(args, timeout, build_dir)
with open('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.24.1.735.g03f4e72817-goog
\
 
 \ /
  Last update: 2019-12-16 23:08    [W:0.103 / U:6.972 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site