From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brendan Higgins Subject: [PATCH v2 13/17] kunit: defconfig: add defconfigs for building KUnit tests Date: Wed, 1 May 2019 16:01:22 -0700 Message-ID: <20190501230126.229218-14-brendanhiggins@google.com> References: <20190501230126.229218-1-brendanhiggins@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190501230126.229218-1-brendanhiggins@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: frowand.list@gmail.com, gregkh@linuxfoundation.org, keescook@google.com, kieran.bingham@ideasonboard.com, mcgrof@kernel.org, robh@kernel.org, sboyd@kernel.org, shuah@kernel.org Cc: pmladek@suse.com, linux-doc@vger.kernel.org, amir73il@gmail.com, Brendan Higgins , 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, rientjes@google.com, 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, linux-kernel@vger.kernel.org, mpe@ellerman.id.au, linux-fsdevel@vger.kernel.org, logang@deltatee.com List-Id: linux-nvdimm@lists.01.org QWRkIGRlZmNvbmZpZyBmb3IgVU1MIGFuZCBhIGZyYWdtZW50IHRoYXQgY2FuIGJlIHVzZWQgdG8g Y29uZmlndXJlIG90aGVyCmFyY2hpdGVjdHVyZXMgZm9yIGJ1aWxkaW5nIEtVbml0IHRlc3RzLiBB ZGQgb3B0aW9uIHRvIGt1bml0X3Rvb2wgdG8gdXNlCmEgZGVmY29uZmlnIHRvIGNyZWF0ZSB0aGUg a3VuaXRjb25maWcuCgpTaWduZWQtb2ZmLWJ5OiBCcmVuZGFuIEhpZ2dpbnMgPGJyZW5kYW5oaWdn aW5zQGdvb2dsZS5jb20+Ci0tLQogYXJjaC91bS9jb25maWdzL2t1bml0X2RlZmNvbmZpZyAgICAg ICAgICAgICAgfCAgOCArKysrKysrKwogdG9vbHMvdGVzdGluZy9rdW5pdC9jb25maWdzL2FsbF90 ZXN0cy5jb25maWcgfCAgOCArKysrKysrKwogdG9vbHMvdGVzdGluZy9rdW5pdC9rdW5pdC5weSAg ICAgICAgICAgICAgICAgfCAxNyArKysrKysrKysrKysrKystLQogdG9vbHMvdGVzdGluZy9rdW5p dC9rdW5pdF9rZXJuZWwucHkgICAgICAgICAgfCAgMyArKy0KIDQgZmlsZXMgY2hhbmdlZCwgMzMg aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBhcmNoL3Vt L2NvbmZpZ3Mva3VuaXRfZGVmY29uZmlnCiBjcmVhdGUgbW9kZSAxMDA2NDQgdG9vbHMvdGVzdGlu Zy9rdW5pdC9jb25maWdzL2FsbF90ZXN0cy5jb25maWcKCmRpZmYgLS1naXQgYS9hcmNoL3VtL2Nv bmZpZ3Mva3VuaXRfZGVmY29uZmlnIGIvYXJjaC91bS9jb25maWdzL2t1bml0X2RlZmNvbmZpZwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwLi5iZmU0OTY4OTAzOGYxCi0t LSAvZGV2L251bGwKKysrIGIvYXJjaC91bS9jb25maWdzL2t1bml0X2RlZmNvbmZpZwpAQCAtMCww ICsxLDggQEAKK0NPTkZJR19PRj15CitDT05GSUdfT0ZfVU5JVFRFU1Q9eQorQ09ORklHX09GX09W RVJMQVk9eQorQ09ORklHX0kyQz15CitDT05GSUdfSTJDX01VWD15CitDT05GSUdfS1VOSVQ9eQor Q09ORklHX0tVTklUX1RFU1Q9eQorQ09ORklHX0tVTklUX0VYQU1QTEVfVEVTVD15CmRpZmYgLS1n aXQgYS90b29scy90ZXN0aW5nL2t1bml0L2NvbmZpZ3MvYWxsX3Rlc3RzLmNvbmZpZyBiL3Rvb2xz L3Rlc3Rpbmcva3VuaXQvY29uZmlncy9hbGxfdGVzdHMuY29uZmlnCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAuLmJmZTQ5Njg5MDM4ZjEKLS0tIC9kZXYvbnVsbAorKysg Yi90b29scy90ZXN0aW5nL2t1bml0L2NvbmZpZ3MvYWxsX3Rlc3RzLmNvbmZpZwpAQCAtMCwwICsx LDggQEAKK0NPTkZJR19PRj15CitDT05GSUdfT0ZfVU5JVFRFU1Q9eQorQ09ORklHX09GX09WRVJM QVk9eQorQ09ORklHX0kyQz15CitDT05GSUdfSTJDX01VWD15CitDT05GSUdfS1VOSVQ9eQorQ09O RklHX0tVTklUX1RFU1Q9eQorQ09ORklHX0tVTklUX0VYQU1QTEVfVEVTVD15CmRpZmYgLS1naXQg YS90b29scy90ZXN0aW5nL2t1bml0L2t1bml0LnB5IGIvdG9vbHMvdGVzdGluZy9rdW5pdC9rdW5p dC5weQppbmRleCA3NDEzZWM3MzUxYTIwLi42M2U5ZmIzYjYwMjAwIDEwMDc1NQotLS0gYS90b29s cy90ZXN0aW5nL2t1bml0L2t1bml0LnB5CisrKyBiL3Rvb2xzL3Rlc3Rpbmcva3VuaXQva3VuaXQu cHkKQEAgLTExLDYgKzExLDcgQEAgaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQgc3lzCiBpbXBvcnQg b3MKIGltcG9ydCB0aW1lCitpbXBvcnQgc2h1dGlsCiAKIGltcG9ydCBrdW5pdF9jb25maWcKIGlt cG9ydCBrdW5pdF9rZXJuZWwKQEAgLTM2LDE0ICszNywyNiBAQCBwYXJzZXIuYWRkX2FyZ3VtZW50 KCctLWJ1aWxkX2RpcicsCiAJCSAgICAnZGlyZWN0b3J5LicsCiAJCSAgICB0eXBlPXN0ciwgZGVm YXVsdD1Ob25lLCBtZXRhdmFyPSdidWlsZF9kaXInKQogCi1jbGlfYXJncyA9IHBhcnNlci5wYXJz ZV9hcmdzKCkKK3BhcnNlci5hZGRfYXJndW1lbnQoJy0tZGVmY29uZmlnJywKKwkJICAgIGhlbHA9 J1VzZXMgYSBkZWZhdWx0IGt1bml0Y29uZmlnLicsCisJCSAgICBhY3Rpb249J3N0b3JlX3RydWUn KQogCi1saW51eCA9IGt1bml0X2tlcm5lbC5MaW51eFNvdXJjZVRyZWUoKQorZGVmIGNyZWF0ZV9k ZWZhdWx0X2t1bml0Y29uZmlnKCk6CisJaWYgbm90IG9zLnBhdGguZXhpc3RzKGt1bml0X2tlcm5l bC5LVU5JVENPTkZJR19QQVRIKToKKwkJc2h1dGlsLmNvcHlmaWxlKCdhcmNoL3VtL2NvbmZpZ3Mv a3VuaXRfZGVmY29uZmlnJywKKwkJCQlrdW5pdF9rZXJuZWwuS1VOSVRDT05GSUdfUEFUSCkKKwor Y2xpX2FyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCiAKIGJ1aWxkX2RpciA9IE5vbmUKIGlmIGNs aV9hcmdzLmJ1aWxkX2RpcjoKIAlidWlsZF9kaXIgPSBjbGlfYXJncy5idWlsZF9kaXIKIAoraWYg Y2xpX2FyZ3MuZGVmY29uZmlnOgorCWNyZWF0ZV9kZWZhdWx0X2t1bml0Y29uZmlnKCkKKworbGlu dXggPSBrdW5pdF9rZXJuZWwuTGludXhTb3VyY2VUcmVlKCkKKwogY29uZmlnX3N0YXJ0ID0gdGlt ZS50aW1lKCkKIHN1Y2Nlc3MgPSBsaW51eC5idWlsZF9yZWNvbmZpZyhidWlsZF9kaXIpCiBjb25m aWdfZW5kID0gdGltZS50aW1lKCkKZGlmZiAtLWdpdCBhL3Rvb2xzL3Rlc3Rpbmcva3VuaXQva3Vu aXRfa2VybmVsLnB5IGIvdG9vbHMvdGVzdGluZy9rdW5pdC9rdW5pdF9rZXJuZWwucHkKaW5kZXgg MDdjMGFiZjJmNDdkZi4uYmYzODc2ODM1MzMxMyAxMDA2NDQKLS0tIGEvdG9vbHMvdGVzdGluZy9r dW5pdC9rdW5pdF9rZXJuZWwucHkKKysrIGIvdG9vbHMvdGVzdGluZy9rdW5pdC9rdW5pdF9rZXJu ZWwucHkKQEAgLTE0LDYgKzE0LDcgQEAgaW1wb3J0IG9zCiBpbXBvcnQga3VuaXRfY29uZmlnCiAK IEtDT05GSUdfUEFUSCA9ICcuY29uZmlnJworS1VOSVRDT05GSUdfUEFUSCA9ICdrdW5pdGNvbmZp ZycKIAogY2xhc3MgQ29uZmlnRXJyb3IoRXhjZXB0aW9uKToKIAkiIiJSZXByZXNlbnRzIGFuIGVy cm9yIHRyeWluZyB0byBjb25maWd1cmUgdGhlIExpbnV4IGtlcm5lbC4iIiIKQEAgLTgxLDcgKzgy LDcgQEAgY2xhc3MgTGludXhTb3VyY2VUcmVlKG9iamVjdCk6CiAKIAlkZWYgX19pbml0X18oc2Vs Zik6CiAJCXNlbGYuX2tjb25maWcgPSBrdW5pdF9jb25maWcuS2NvbmZpZygpCi0JCXNlbGYuX2tj b25maWcucmVhZF9mcm9tX2ZpbGUoJ2t1bml0Y29uZmlnJykKKwkJc2VsZi5fa2NvbmZpZy5yZWFk X2Zyb21fZmlsZShLVU5JVENPTkZJR19QQVRIKQogCQlzZWxmLl9vcHMgPSBMaW51eFNvdXJjZVRy ZWVPcGVyYXRpb25zKCkKIAogCWRlZiBjbGVhbihzZWxmKToKLS0gCjIuMjEuMC41OTMuZzUxMWVj MzQ1ZTE4LWdvb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bA== 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=-16.6 required=3.0 tests=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 575F8C43219 for ; Wed, 1 May 2019 23:04:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CFF62089E for ; Wed, 1 May 2019 23:04:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GE0P464m" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726566AbfEAXEs (ORCPT ); Wed, 1 May 2019 19:04:48 -0400 Received: from mail-oi1-f202.google.com ([209.85.167.202]:40230 "EHLO mail-oi1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbfEAXEo (ORCPT ); Wed, 1 May 2019 19:04:44 -0400 Received: by mail-oi1-f202.google.com with SMTP id q82so339321oif.7 for ; Wed, 01 May 2019 16:04:44 -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=chqbiB4K0p/zEKsVbXe4iW2Xpj6yAVIrWQhjpUaEvyA=; b=GE0P464mBtC8wrhfBO7g793E4I4dqW2RIP7+tHwU/PC57hjNo6fmzw5HElvCwVJ32i ZkuQrQPVcHSfFt6v723klhDSf/BCGNNvLIImZbUWeECzTjsM5G6js6Y4BB5vjlq16LAN nySbgJK0p0eYO+3PMfew/5txRXxjgd1tovWq5YKZjGYzlDxEQ+Q6GSZnOMuy+DFhqKMT uJ3lLNt16MIjzkoA11kKC2qDuhYsfvUVFDvaTEF8ASb3zPAzcT2kDwqalnmACvYsWp+Z 7T2yCIRZwzp4TkmtK1c2L5CoSAeNHI4xKfYHm9/xZ7l5IMHM0zff93mqcrZ2D4EpNlPo NA2Q== 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=chqbiB4K0p/zEKsVbXe4iW2Xpj6yAVIrWQhjpUaEvyA=; b=lRyh+Oh5ZNizhK7WO0cs3gj6A/oHtpPmCrcdwEmvPb37n0hPJ2241TOhuEMDI0z+Uf kN0+3eCW8QNeOkQd37SC/0KD6fPPZMuHarxV3eiH8dzHygd4t9IdDdBCpRpY+ctKYArS 2wD/k0n1ewmNuz1t+HXuSrgLFwJiJCbYoUUltRT9iYnWOPfBYsLdEKg3Yat8QVQF6OP5 wLHlzM1p+10y3BvJsVK4PLeFGtBP7BkSKTxeoLcR80TtP7q6SRHSVgK6MbTk09cQ1PIE tyIPCQxdhEaLPCzL2CXycnohi4ueiNS1dxeQWaxPTlWkVsY5KUk3spym+0Vf6A3Q80rm Uf4A== X-Gm-Message-State: APjAAAXhqy5I74sZ7L6HZ8TVgEEU4fJjW54rAnMv2y0VkQLpP/DDjQQH cQabLmJ8lSKhWBjVdnP2+QydGreeiOwOdmPVXkameQ== X-Google-Smtp-Source: APXvYqziahGWgdBZbQfWG2ft5ebLp+ozkgppLiv8kSSis3P9fMvGcrL9eofrdvhLG15CPkadoMaZYjcvL9G8Pk6lBON+yg== X-Received: by 2002:aca:cd88:: with SMTP id d130mr481038oig.63.1556751883876; Wed, 01 May 2019 16:04:43 -0700 (PDT) Date: Wed, 1 May 2019 16:01:22 -0700 In-Reply-To: <20190501230126.229218-1-brendanhiggins@google.com> Message-Id: <20190501230126.229218-14-brendanhiggins@google.com> Mime-Version: 1.0 References: <20190501230126.229218-1-brendanhiggins@google.com> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH v2 13/17] kunit: defconfig: add defconfigs for building KUnit tests From: Brendan Higgins To: frowand.list@gmail.com, gregkh@linuxfoundation.org, keescook@google.com, kieran.bingham@ideasonboard.com, mcgrof@kernel.org, robh@kernel.org, sboyd@kernel.org, shuah@kernel.org Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, kunit-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-um@lists.infradead.org, Alexander.Levin@microsoft.com, Tim.Bird@sony.com, amir73il@gmail.com, dan.carpenter@oracle.com, dan.j.williams@intel.com, daniel@ffwll.ch, jdike@addtoit.com, joel@jms.id.au, julia.lawall@lip6.fr, khilman@baylibre.com, knut.omang@oracle.com, logang@deltatee.com, mpe@ellerman.id.au, pmladek@suse.com, richard@nod.at, rientjes@google.com, rostedt@goodmis.org, wfg@linux.intel.com, Brendan Higgins 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 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 --- 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.593.g511ec345e18-goog From mboxrd@z Thu Jan 1 00:00:00 1970 From: brendanhiggins at google.com (Brendan Higgins) Date: Wed, 1 May 2019 16:01:22 -0700 Subject: [PATCH v2 13/17] kunit: defconfig: add defconfigs for building KUnit tests In-Reply-To: <20190501230126.229218-1-brendanhiggins@google.com> References: <20190501230126.229218-1-brendanhiggins@google.com> Message-ID: <20190501230126.229218-14-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 --- 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.593.g511ec345e18-goog From mboxrd@z Thu Jan 1 00:00:00 1970 From: brendanhiggins@google.com (Brendan Higgins) Date: Wed, 1 May 2019 16:01:22 -0700 Subject: [PATCH v2 13/17] kunit: defconfig: add defconfigs for building KUnit tests In-Reply-To: <20190501230126.229218-1-brendanhiggins@google.com> References: <20190501230126.229218-1-brendanhiggins@google.com> Message-ID: <20190501230126.229218-14-brendanhiggins@google.com> Content-Type: text/plain; charset="UTF-8" Message-ID: <20190501230122.7S-qXH12jb6QWeca30AB0fqkw97mRGDga_Pnnz-_Af4@z> 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 --- 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.593.g511ec345e18-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ot1-x34a.google.com ([2607:f8b0:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hLyHN-0007aZ-E2 for linux-um@lists.infradead.org; Wed, 01 May 2019 23:04:46 +0000 Received: by mail-ot1-x34a.google.com with SMTP id q23so295994otk.10 for ; Wed, 01 May 2019 16:04:44 -0700 (PDT) Date: Wed, 1 May 2019 16:01:22 -0700 In-Reply-To: <20190501230126.229218-1-brendanhiggins@google.com> Message-Id: <20190501230126.229218-14-brendanhiggins@google.com> Mime-Version: 1.0 References: <20190501230126.229218-1-brendanhiggins@google.com> Subject: [PATCH v2 13/17] kunit: defconfig: add defconfigs for building KUnit tests From: Brendan Higgins List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: frowand.list@gmail.com, gregkh@linuxfoundation.org, keescook@google.com, kieran.bingham@ideasonboard.com, mcgrof@kernel.org, robh@kernel.org, sboyd@kernel.org, shuah@kernel.org Cc: pmladek@suse.com, linux-doc@vger.kernel.org, amir73il@gmail.com, Brendan Higgins , 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, rientjes@google.com, 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, linux-kernel@vger.kernel.org, daniel@ffwll.ch, mpe@ellerman.id.au, linux-fsdevel@vger.kernel.org, logang@deltatee.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 --- 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.593.g511ec345e18-goog _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um