Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2677632pxa; Fri, 7 Aug 2020 18:21:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG9OkAH2Mw1Mmi7jNbrosF5BqAjxaDStyHAU2S71xfLNvvdKxuRBOg7URJkoqvg4y419Dy X-Received: by 2002:a17:906:6bda:: with SMTP id t26mr12375894ejs.214.1596849686457; Fri, 07 Aug 2020 18:21:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596849686; cv=none; d=google.com; s=arc-20160816; b=QwZa1Z3/zKaaJTO97sesfsAqfTkCRUCwB20CaHYyDiIDsuqhJ79s6OYg+KvSjtq9T/ 5I58TmO7RKVnJxFyTeiXh7ALC+DK5bGx8azS+NDNHOPopRI7N4xSF3kBFMUC6xA5p5Q6 XQOTrTcmL9ymGPqo67bNSc/HYTQO5eGwy1mXJdnpIkqNrlZGr99Dk4haYZjBO2Nohx3r CKZNm6lhjAb57balOUlqha8IumX4c9zEhKlMMyDWePtZaktIE79xx+2sZjHQ93TsjeSA jPXoXi52vLuoYlqbvEvGBhSkSKsh/qMqINTMo7kuPfuZIOpFS3/pz/L4epDcFK7zVJxd scRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:mime-version :message-id:date:dkim-signature; bh=qDtgVx5yXEzQ++OacfHgx9dKEkbfCyUB5rxuAZU49e8=; b=uzM02eJAtE0tPxxh/4vqtQ2HujoW6RTx4VWtq2zx5zpK0rRX/71l4pA0itB9jklx4w YlG4MNhCxdWhcEf3m7D336nT3wtXDybIKWg4X4wMqcA6NMtlzS1jtG7DE8AQbUBemxO3 m7kiW0kVv/Fzc1v5U2Hr6CFcP2VPmfXSp3ZKTFVUv3XTFpWPoq752QaJoewnhRpLVQ1J h9OGjN6JdSoh8U3BqFm/+d8lPMVFoeAMMuE+ZDaWPynJlUS0hVM7rr0pyLad6VEIk7jE 6OryRzI3Ev4dk5M0A0tJ2Xn6xmEy70S3BMYuf5dTV5GURuMFKLrg3m4ulWmpKPt3G1ma +Z0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=fjeWWPzv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n25si6696294ejs.131.2020.08.07.18.21.03; Fri, 07 Aug 2020 18:21:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=fjeWWPzv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726191AbgHHBRR (ORCPT + 99 others); Fri, 7 Aug 2020 21:17:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726159AbgHHBRR (ORCPT ); Fri, 7 Aug 2020 21:17:17 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05640C061757 for ; Fri, 7 Aug 2020 18:17:16 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id b127so4942239ybh.21 for ; Fri, 07 Aug 2020 18:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=qDtgVx5yXEzQ++OacfHgx9dKEkbfCyUB5rxuAZU49e8=; b=fjeWWPzv3ENtmT1A5ELAglDHmhrNm2w8zH41/GIdI0PkRkqGvjZlzZXH8IBXXBh+uq qKLfdMnIoB8Z4Rd9jMog3//UBJF8IkTSmfoBvcjWijMcDYhquUsxI7xbEdMSQpYv2Fpd oN37Vy7OsQe3BL32UCedj2LRnH3OElFD3Fd6tW/WPn9bx0C4MIv0BuCZDy52nQUMHT6x ZjJ4Z47lFRWOv2h+nxXer+Ffc2mah8yhxxGYKzFOF3IzyVbr5sADj/DhdbpZaowV8NG4 mvY/1bM48GAzG24++yyx3LIFuCLh9PEs5JNuHRMPTiCPlDbFpHe9B9MRgsR+urql5V9/ 71WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=qDtgVx5yXEzQ++OacfHgx9dKEkbfCyUB5rxuAZU49e8=; b=KSzyvyLGQEWbxCcrGwWeuHOly7AF+zPXx+Yz9GMIlk6f1ItTmRm2dnDaZx/a5qMnTn BdQ75oQHRCubLOrIlF35knOdorTGLD0LQJfMhLXsp1V0BnDEWB7RcbI39+fqBaSaRa4n X62wPnZx2db9n4n5mZTFVLC9cJjSZyYksBBJiRtQ+H+4aH5UgZ9S6Hg8EAKFENpzc/wx 2A087g4TlaoC8ZtGkaU6XnUSRlKvQZSdS8EElP/JcIuQRC58P/cCdIlJ+cBBF0YyOrox 29m2iZoOlxO/71R5k7MeAUIDiY1Q3zU1WTpo9qVMHg3V/Y7FEc3RgHhycY0xCqRfYlQ1 vk9g== X-Gm-Message-State: AOAM532uCo1X7+kkqLwkEVzrmBrqF5GW+sm8jq+JtNN8fcBj+gVswxd6 Nkspoq/ODpkU95PTytDNl1TnUcUGliDDtpmy1q8O8Q== X-Received: by 2002:a25:5808:: with SMTP id m8mr25093531ybb.246.1596849436001; Fri, 07 Aug 2020 18:17:16 -0700 (PDT) Date: Fri, 7 Aug 2020 18:16:50 -0700 Message-Id: <20200808011651.2113930-1-brendanhiggins@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.236.gb10cc79966-goog Subject: [PATCH v1 1/2] kunit: tool: fix running kunit_tool from outside kernel tree From: Brendan Higgins To: shuah@kernel.org, davidgow@google.com Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, 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 Currently kunit_tool does not work correctly when executed from a path outside of the kernel tree, so make sure that the current working directory is correct and the kunit_dir is properly initialized before running. Signed-off-by: Brendan Higgins --- tools/testing/kunit/kunit.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index 425ef40067e7..96344a11ff1f 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -237,9 +237,14 @@ def main(argv, linux=None): cli_args = parser.parse_args(argv) + if get_kernel_root_path(): + print('cd ' + get_kernel_root_path()) + os.chdir(get_kernel_root_path()) + if cli_args.subcommand == 'run': if not os.path.exists(cli_args.build_dir): os.mkdir(cli_args.build_dir) + create_default_kunitconfig() if not linux: linux = kunit_kernel.LinuxSourceTree() @@ -257,6 +262,7 @@ def main(argv, linux=None): if cli_args.build_dir: if not os.path.exists(cli_args.build_dir): os.mkdir(cli_args.build_dir) + create_default_kunitconfig() if not linux: linux = kunit_kernel.LinuxSourceTree() @@ -273,6 +279,7 @@ def main(argv, linux=None): if cli_args.build_dir: if not os.path.exists(cli_args.build_dir): os.mkdir(cli_args.build_dir) + create_default_kunitconfig() if not linux: linux = kunit_kernel.LinuxSourceTree() @@ -291,6 +298,7 @@ def main(argv, linux=None): if cli_args.build_dir: if not os.path.exists(cli_args.build_dir): os.mkdir(cli_args.build_dir) + create_default_kunitconfig() if not linux: linux = kunit_kernel.LinuxSourceTree() base-commit: 30185b69a2d533c4ba6ca926b8390ce7de495e29 -- 2.28.0.236.gb10cc79966-goog