From: Brendan Higgins <brendanhiggins@google.com>
To: corbet@lwn.net, frowand.list@gmail.com, keescook@google.com,
kieran.bingham@ideasonboard.com, mcgrof@kernel.org,
robh@kernel.org, shuah@kernel.org, yamada.masahiro@socionext.com
Cc: pmladek@suse.com, linux-doc@vger.kernel.org, amir73il@gmail.com,
Brendan Higgins <brendanhiggins@google.com>,
dri-devel@lists.freedesktop.org, Alexander.Levin@microsoft.com,
linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org,
khilman@baylibre.com, knut.omang@oracle.com, wfg@linux.intel.com,
joel@jms.id.au, jdike@addtoit.com, dan.carpenter@oracle.com,
devicetree@vger.kernel.org, linux-kbuild@vger.kernel.org,
Tim.Bird@sony.com, linux-um@lists.infradead.org,
rostedt@goodmis.org, julia.lawall@lip6.fr,
dan.j.williams@intel.com, kunit-dev@googlegroups.com,
richard@nod.at, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org, mpe@ellerman.id.au,
linux-fsdevel@vger.kernel.org
Subject: [PATCH v1 13/17] kunit: defconfig: add defconfigs for building KUnit tests
Date: Thu, 4 Apr 2019 15:06:48 -0700 [thread overview]
Message-ID: <20190404220652.19765-14-brendanhiggins@google.com> (raw)
In-Reply-To: <20190404220652.19765-1-brendanhiggins@google.com>
Add defconfig for UML and a fragment that can be used to configure other
architectures for building KUnit tests. Add option to kunit_tool to use
a defconfig to create the kunitconfig.
Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
---
arch/um/configs/kunit_defconfig | 8 ++++++++
tools/testing/kunit/configs/all_tests.config | 8 ++++++++
tools/testing/kunit/kunit.py | 17 +++++++++++++++--
tools/testing/kunit/kunit_kernel.py | 3 ++-
4 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 arch/um/configs/kunit_defconfig
create mode 100644 tools/testing/kunit/configs/all_tests.config
diff --git a/arch/um/configs/kunit_defconfig b/arch/um/configs/kunit_defconfig
new file mode 100644
index 0000000000000..bfe49689038f1
--- /dev/null
+++ b/arch/um/configs/kunit_defconfig
@@ -0,0 +1,8 @@
+CONFIG_OF=y
+CONFIG_OF_UNITTEST=y
+CONFIG_OF_OVERLAY=y
+CONFIG_I2C=y
+CONFIG_I2C_MUX=y
+CONFIG_KUNIT=y
+CONFIG_KUNIT_TEST=y
+CONFIG_KUNIT_EXAMPLE_TEST=y
diff --git a/tools/testing/kunit/configs/all_tests.config b/tools/testing/kunit/configs/all_tests.config
new file mode 100644
index 0000000000000..bfe49689038f1
--- /dev/null
+++ b/tools/testing/kunit/configs/all_tests.config
@@ -0,0 +1,8 @@
+CONFIG_OF=y
+CONFIG_OF_UNITTEST=y
+CONFIG_OF_OVERLAY=y
+CONFIG_I2C=y
+CONFIG_I2C_MUX=y
+CONFIG_KUNIT=y
+CONFIG_KUNIT_TEST=y
+CONFIG_KUNIT_EXAMPLE_TEST=y
diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py
index 7413ec7351a20..63e9fb3b60200 100755
--- a/tools/testing/kunit/kunit.py
+++ b/tools/testing/kunit/kunit.py
@@ -11,6 +11,7 @@ import argparse
import sys
import os
import time
+import shutil
import kunit_config
import kunit_kernel
@@ -36,14 +37,26 @@ parser.add_argument('--build_dir',
'directory.',
type=str, default=None, metavar='build_dir')
-cli_args = parser.parse_args()
+parser.add_argument('--defconfig',
+ help='Uses a default kunitconfig.',
+ action='store_true')
-linux = kunit_kernel.LinuxSourceTree()
+def create_default_kunitconfig():
+ if not os.path.exists(kunit_kernel.KUNITCONFIG_PATH):
+ shutil.copyfile('arch/um/configs/kunit_defconfig',
+ kunit_kernel.KUNITCONFIG_PATH)
+
+cli_args = parser.parse_args()
build_dir = None
if cli_args.build_dir:
build_dir = cli_args.build_dir
+if cli_args.defconfig:
+ create_default_kunitconfig()
+
+linux = kunit_kernel.LinuxSourceTree()
+
config_start = time.time()
success = linux.build_reconfig(build_dir)
config_end = time.time()
diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index 07c0abf2f47df..bf38768353313 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -14,6 +14,7 @@ import os
import kunit_config
KCONFIG_PATH = '.config'
+KUNITCONFIG_PATH = 'kunitconfig'
class ConfigError(Exception):
"""Represents an error trying to configure the Linux kernel."""
@@ -81,7 +82,7 @@ class LinuxSourceTree(object):
def __init__(self):
self._kconfig = kunit_config.Kconfig()
- self._kconfig.read_from_file('kunitconfig')
+ self._kconfig.read_from_file(KUNITCONFIG_PATH)
self._ops = LinuxSourceTreeOperations()
def clean(self):
--
2.21.0.392.gf8f6787159e-goog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-04-04 22:06 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 22:06 [PATCH v1 00/17] kunit: introduce KUnit, the Linux kernel unit testing framework Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 01/17] kunit: test: add KUnit test runner core Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 04/17] kunit: test: add kunit_stream a std::stream like logger Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 08/17] kunit: test: add support for test abort Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 09/17] kunit: test: add tests for kunit " Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 11/17] kunit: test: add test managed resource tests Brendan Higgins
2019-04-24 19:00 ` Masayoshi Mizuma
2019-04-25 21:39 ` Brendan Higgins
[not found] ` <20190404220652.19765-1-brendanhiggins-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
2019-04-04 22:06 ` [PATCH v1 02/17] kunit: test: add test resource management API Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 03/17] kunit: test: add string_stream a std::stream like string builder Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 05/17] kunit: test: add the concept of expectations Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 06/17] kbuild: enable building KUnit Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 07/17] kunit: test: add initial tests Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 10/17] kunit: test: add the concept of assertions Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 12/17] kunit: tool: add Python wrappers for running KUnit tests Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 15/17] MAINTAINERS: add entry for KUnit the unit testing framework Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 16/17] kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec() Brendan Higgins
2019-04-04 22:06 ` Brendan Higgins [this message]
2019-04-04 22:06 ` [PATCH v1 14/17] Documentation: kunit: add documentation for KUnit Brendan Higgins
2019-04-24 18:58 ` Masayoshi Mizuma
2019-04-25 21:37 ` Brendan Higgins
2019-04-04 22:06 ` [PATCH v1 17/17] MAINTAINERS: add proc sysctl KUnit test to PROC SYSCTL section 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=20190404220652.19765-14-brendanhiggins@google.com \
--to=brendanhiggins@google.com \
--cc=Alexander.Levin@microsoft.com \
--cc=Tim.Bird@sony.com \
--cc=amir73il@gmail.com \
--cc=corbet@lwn.net \
--cc=dan.carpenter@oracle.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jdike@addtoit.com \
--cc=joel@jms.id.au \
--cc=julia.lawall@lip6.fr \
--cc=keescook@google.com \
--cc=khilman@baylibre.com \
--cc=kieran.bingham@ideasonboard.com \
--cc=knut.omang@oracle.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-um@lists.infradead.org \
--cc=mcgrof@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=pmladek@suse.com \
--cc=richard@nod.at \
--cc=robh@kernel.org \
--cc=rostedt@goodmis.org \
--cc=shuah@kernel.org \
--cc=wfg@linux.intel.com \
--cc=yamada.masahiro@socionext.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).