From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17D9AC46475 for ; Wed, 24 Oct 2018 03:34:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ACCDA206B5 for ; Wed, 24 Oct 2018 03:34:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="AB6ok6PX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACCDA206B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726543AbeJXMAL (ORCPT ); Wed, 24 Oct 2018 08:00:11 -0400 Received: from mail-oi1-f201.google.com ([209.85.167.201]:55334 "EHLO mail-oi1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725896AbeJXMAK (ORCPT ); Wed, 24 Oct 2018 08:00:10 -0400 Received: by mail-oi1-f201.google.com with SMTP id m129-v6so2493150oif.22 for ; Tue, 23 Oct 2018 20:33:59 -0700 (PDT) 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=44RvLdlbHWeLbsI4FsWkczRJMebcjaBtMNCiH44tKr0=; b=AB6ok6PXf9wGtYqQaN8gyoMLpZEzKJCwiN4OhbIFy/qhSvJz7T85MzLTEVa5WyftLU Zj9/+0PEE9UUjrPcKFTnjad7y6c8J5QhyD8nS/SK6OeQf8KAN8LJIBbq1GtkYlLATYlm XuGhc+WVLGI4RnNCnl3GHr1IsiMKGr1YnByk13qhCKHoPCgqZyLsR8NhP4AoPjLLmJvI HtRNhfgUtT0PWXXzQTmOox/QL7sHfUxZAk9EfWY7S1/VCgNskcVGlpl2zz+gCE9D4Exb EkjD/I05wGnrEpqk4N9vy8WimHN7Bka9Wxk+G6l477RjELqGvZ+2YhvU26zWMKM+0s/1 sCSQ== 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=44RvLdlbHWeLbsI4FsWkczRJMebcjaBtMNCiH44tKr0=; b=OiH8+l8AWUg/Zej/5aLRCbDLN1xPg2kK2jKc5Wnj1LD+i7p82KndaLYFVKCq1YHaVe 2F8A6eh0l6EX8b+RCHPTK+1IDTHtiDFowVJrsU0zZHrlZSZgNeYgFrZmTFJufJoDOC+r lkH6vz2XXFAU2CvDw/+fLAymXnVgXP+GxMeIX/TMxSlD+hIpcsdX5qTApyjSs0HZYRL9 teyi6FG+FDTUjP8uYJ23Sz2wTlnOqQO1YdGnbG4cGn/WOfDWCh1V2eSOMwLdXQQ2Ib0q +83Wi8Mmwr0j5eSAL41hNrpR39FmIjehnhLPhNtxwLdy87v0k6yQ+r70/G4HInzgRT7x lf+w== X-Gm-Message-State: AGRZ1gLzFcNWl76oEVkdogpq0j8nh2AuxSsMgs71zR/Y2TK/df8ibdfL ixCy0DELnYq0UeAIbSPV9aO718PgFyjD5540mze0eg== X-Google-Smtp-Source: AJdET5f0SC1xD3J1Eyxz7caHVqEYtJVlMvJgMo/XK4X/oZGUsB/MepnsvKeKrQqmc03IywVjgrdWTH8z3/9jDu3XbFidzA== X-Received: by 2002:a9d:48f8:: with SMTP id a53mr318139otj.18.1540339204891; Tue, 23 Oct 2018 17:00:04 -0700 (PDT) Date: Tue, 23 Oct 2018 16:57:47 -0700 In-Reply-To: <20181023235750.103146-1-brendanhiggins@google.com> Message-Id: <20181023235750.103146-12-brendanhiggins@google.com> Mime-Version: 1.0 References: <20181023235750.103146-1-brendanhiggins@google.com> X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [RFC v2 11/14] kunit: add KUnit wrapper script and simple output parser From: Brendan Higgins To: gregkh@linuxfoundation.org, keescook@google.com, mcgrof@kernel.org, shuah@kernel.org Cc: joel@jms.id.au, mpe@ellerman.id.au, joe@perches.com, brakmo@fb.com, rostedt@goodmis.org, Tim.Bird@sony.com, khilman@baylibre.com, julia.lawall@lip6.fr, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, jdike@addtoit.com, richard@nod.at, linux-um@lists.infradead.org, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, robh@kernel.org, dan.j.williams@intel.com, linux-nvdimm@lists.01.org, kieran.bingham@ideasonboard.com, Brendan Higgins , Felix Guo Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The KUnit wrapper script interfaces with the two modules (kunit_config.py and kunit_kernel.py) and provides a command line interface for running KUnit tests. This interface allows the caller to specify options like test timeouts. The script handles configuring, building and running the kernel and tests. The output parser (kunit_parser.py) simply strips out all the output from the kernel that is outputted as part of it's initialization sequence. This ensures that only the output from KUnit is displayed on the screen. A full version of the output is written to test.log, or can be seen by passing --raw_output to the wrapper script. Signed-off-by: Felix Guo Signed-off-by: Brendan Higgins --- tools/testing/kunit/kunit.py | 40 +++++++++++++++++++++++++++++ tools/testing/kunit/kunit_kernel.py | 3 +-- tools/testing/kunit/kunit_parser.py | 24 +++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100755 tools/testing/kunit/kunit.py create mode 100644 tools/testing/kunit/kunit_parser.py diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py new file mode 100755 index 0000000000000..1356be404996b --- /dev/null +++ b/tools/testing/kunit/kunit.py @@ -0,0 +1,40 @@ +#!/usr/bin/python3 +# SPDX-License-Identifier: GPL-2.0 + +# A thin wrapper on top of the KUnit Kernel + +import argparse +import sys +import os + +import kunit_config +import kunit_kernel +import kunit_parser + +parser = argparse.ArgumentParser(description='Runs KUnit tests.') + +parser.add_argument('--raw_output', help='don\'t format output from kernel', + action='store_true') + +parser.add_argument('--timeout', help='maximum number of seconds to allow for ' + 'all tests to run. This does not include time taken to ' + 'build the tests.', type=int, default=300, + metavar='timeout') + +cli_args = parser.parse_args() +linux = kunit_kernel.LinuxSourceTree() + +success = linux.build_reconfig() +if not success: + quit() + +print('Building KUnit Kernel ...') +success = linux.build_um_kernel() +if not success: + quit() + +print('Starting KUnit Kernel ...') +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)) diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index 87abaede50513..c1259b174f7d4 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -113,8 +113,7 @@ class LinuxSourceTree(object): return False return True - def run_kernel(self, args=[]): - timeout = None + def run_kernel(self, args=[], timeout=None): args.extend(['mem=256M']) process = self._ops.linux_bin(args, timeout) with open('test.log', 'w') as f: diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py new file mode 100644 index 0000000000000..1dff3adb73bd3 --- /dev/null +++ b/tools/testing/kunit/kunit_parser.py @@ -0,0 +1,24 @@ +# SPDX-License-Identifier: GPL-2.0 + +import re + +kunit_start_re = re.compile('console .* enabled') +kunit_end_re = re.compile('List of all partitions:') + +def isolate_kunit_output(kernel_output): + started = False + for line in kernel_output: + if kunit_start_re.match(line): + started = True + elif kunit_end_re.match(line): + break + elif started: + yield line + +def raw_output(kernel_output): + for line in kernel_output: + print(line) + +def parse_run_tests(kernel_output): + for output in isolate_kunit_output(kernel_output): + print(output) -- 2.19.1.568.g152ad8e336-goog