From patchwork Mon Dec 16 22:05:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Higgins X-Patchwork-Id: 11295417 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A9AC109A for ; Mon, 16 Dec 2019 22:07:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 37A0124673 for ; Mon, 16 Dec 2019 22:07:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KXEdzR5s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727835AbfLPWHL (ORCPT ); Mon, 16 Dec 2019 17:07:11 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:43092 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727801AbfLPWHH (ORCPT ); Mon, 16 Dec 2019 17:07:07 -0500 Received: by mail-pf1-f202.google.com with SMTP id x199so7762958pfc.10 for ; Mon, 16 Dec 2019 14:07:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Q0qe2kR+bAay0VBCKejOtYmpF3XJORWe/2Y7Sg9amhw=; b=KXEdzR5sEfYW47IOMB4cZpps1PEpUNY54j1THILz0FDue58d4xDTo4xEyITzycC8WI cty59wubaPPbwA/praz2PhIRWbMoNlSfJ5HI5lCRKkz8ZEl+1Q+Mgi5nnUk4hwIMFFyK o9a7hgBtcB2M5nWh7oleILEiPMeC9wsSl3JvL9uyI3jcWOWl2HiNpuPS3tm/2kuzXz/2 ZwrcD9NIwbP+TD9B5epGkERp4xEk54xjjIh2KP3BOzg2dWatvs23FcGoe18LGv9tigsN zk7enm6BbQ+IPvYpT59CVbQcLcAbQsDC1kmQ7hMOW4aOh6ehkNGuohUloJyoEOImpdB0 og2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Q0qe2kR+bAay0VBCKejOtYmpF3XJORWe/2Y7Sg9amhw=; b=i/mwfLtSmouY35MAyRg0HNUWS45ifvgFwwv3H7EnC+S1YwxuDB4kS8Zb5u83Utyzab wW1OTfphIfiFF4bDaXPlhIgFRxBzZDIJFkaXyz256vNt60gUSW31oyrh8+LqmHLWscB6 cNFHSISF/Dl6yFcj1unI/zwX6HyuTNUn+t5mchaGhDqselsYUJWBLUfrM+3WU4SiWn+P kUMSQQn0fHsGhWgdr8++wjx/bzRoG5o7CGAw0YOsO8+bdBt1AMnK3qYDSY9UKg9gBtt6 36Xo0F5ljH1RLQUagiGAul1F4pynxK+iT3sPYGyl4nwnBqUxdtnMktFjDfa3LfeEgToL fI2Q== X-Gm-Message-State: APjAAAVgGI0tPQi8BLYT8aqW8Pl/fTqL2qUFE5s9GMKvr3e0lSERpxx0 yZexcvMF2re9CnuUAmCpYYksbdJPkmy/13J3oLlRSA== X-Google-Smtp-Source: APXvYqxRhQSngjdpwvFolaB1SLzzXTDEa/g1lTeVrAduuwj0fvc+F3k5fBaVV1qGODXsFPGnv0IqlV0v+/1bKZjWCdvWlA== X-Received: by 2002:a63:9548:: with SMTP id t8mr9143009pgn.205.1576534024897; Mon, 16 Dec 2019 14:07:04 -0800 (PST) Date: Mon, 16 Dec 2019 14:05:55 -0800 In-Reply-To: <20191216220555.245089-1-brendanhiggins@google.com> Message-Id: <20191216220555.245089-7-brendanhiggins@google.com> Mime-Version: 1.0 References: <20191216220555.245089-1-brendanhiggins@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [RFC v1 6/6] kunit: Add 'kunit_shutdown' option From: Brendan Higgins 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 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, Brendan Higgins Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: David Gow 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 Signed-off-by: Brendan Higgins --- 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 +#include #include +#include #include /* @@ -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