diff options
| author | David Gow <davidgow@google.com> | 2021-05-22 06:42:40 +0200 |
|---|---|---|
| committer | Shuah Khan <skhan@linuxfoundation.org> | 2021-06-24 01:49:17 +0200 |
| commit | d9d6b8225e7319fde69b1aa59c3bb66d501f3845 (patch) | |
| tree | cc32e1dff66ba432b6a71c0dfea728072f13b76e | |
| parent | kunit: arch/um/configs: Enable KUNIT_ALL_TESTS by default (diff) | |
| download | linux-d9d6b8225e7319fde69b1aa59c3bb66d501f3845.tar.xz linux-d9d6b8225e7319fde69b1aa59c3bb66d501f3845.zip | |
kunit: Move default config from arch/um -> tools/testing/kunit
The default .kunitconfig file is currently kept in
arch/um/configs/kunit_defconfig, but -- with the impending QEMU patch
-- will no-longer be exclusively used for UML-based kernels.
Move it alongside the other KUnit configs in
tools/testing/kunit/configs, and give it a name which matches the
existing all_tests.config and broken_on_uml.config files.
Also update the Getting Started documentation to point to the new file.
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
| -rw-r--r-- | Documentation/dev-tools/kunit/start.rst | 2 | ||||
| -rw-r--r-- | tools/testing/kunit/configs/default.config (renamed from arch/um/configs/kunit_defconfig) | 0 | ||||
| -rw-r--r-- | tools/testing/kunit/kunit_kernel.py | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/dev-tools/kunit/start.rst b/Documentation/dev-tools/kunit/start.rst index aa56d7ca6bfb..62d8462db4df 100644 --- a/Documentation/dev-tools/kunit/start.rst +++ b/Documentation/dev-tools/kunit/start.rst @@ -36,7 +36,7 @@ A good starting point for a ``.kunitconfig`` is the KUnit defconfig: .. code-block:: bash cd $PATH_TO_LINUX_REPO - cp arch/um/configs/kunit_defconfig .kunitconfig + cp tools/testing/kunit/configs/default.config .kunitconfig You can then add any other Kconfig options you wish, e.g.: diff --git a/arch/um/configs/kunit_defconfig b/tools/testing/kunit/configs/default.config index e67af7b9f1bb..e67af7b9f1bb 100644 --- a/arch/um/configs/kunit_defconfig +++ b/tools/testing/kunit/configs/default.config diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index e1951fa60027..90bc007f1f93 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -26,7 +26,7 @@ import qemu_config KCONFIG_PATH = '.config' KUNITCONFIG_PATH = '.kunitconfig' -DEFAULT_KUNITCONFIG_PATH = 'arch/um/configs/kunit_defconfig' +DEFAULT_KUNITCONFIG_PATH = 'tools/testing/kunit/configs/default.config' BROKEN_ALLCONFIG_PATH = 'tools/testing/kunit/configs/broken_on_uml.config' OUTFILE_PATH = 'test.log' ABS_TOOL_PATH = os.path.abspath(os.path.dirname(__file__)) |