Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp94055ybm; Tue, 26 May 2020 11:36:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdgjirB9zI18GTqn3FgkydzULppiKHSqwYrbCWEjWpm2ZNvf2JehXy/AMPUc3P3qgoregN X-Received: by 2002:a50:be8f:: with SMTP id b15mr20661178edk.182.1590518207282; Tue, 26 May 2020 11:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590518207; cv=none; d=google.com; s=arc-20160816; b=N1Tsrov1X6On7iWJeu8rNV+Kb2tVnOB6QMowJjRkXbrm9lyQ9E+0exnPLNrqcNsPOW FY96jv1tBlRRrgMi2xNC9z6PufVRTNbj6pIHF6pNwNnU8hGD/zy8GR9t5aCzq25KiALL AKoUNnANdGNAAbk6jALSYUEnoKxS2XmUpqkmXV0PjhXEZniXQDer7vbAkWVkd7n3raNf DmQMZ5yXJY32SdE+F9MQRzaIW+8+01G3y1e72GLyptOnL/+mLZm84qgQ72Ro1hWEbh+v UMpdVoQGcv1lM2ggD8QWJeZjD0GWSDyF/BAziGCOmqxQ9yBQg6zKPOhJwvkEG8wnF2iG Cx/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=X6aXjORE3d23i1StkTonhzGHIalGKnrHwR2gVaYOR1Q=; b=c/6tYwLL5h9dqiMWYHzLBDHuG0U0vuWEcDJbe01xMuoCo3CjSM59dZvd2kueyx0TJN +LmJ5SHEkQtNTaWBjmyxeRmREjPBbFHOoQs9d0D8OhBUN9/YPbLE9Pdac8MSEBIutTaz 1eo3e8Jf3wvBk9NLMgyxZUvwujuHoeFMvVgQFE67G+GsLnk/TkbDhSLjgHJEmj+rksuu jp/3CCNCa+kvuYS6i17PIA6cGLBapSczrhkdjTmg8kDZxIAtj2HwDCSrBzMW0jJbjF4k deAZG7o0B8SMN81DFiWiL/N1VXFB4r9uyUleLjqj8j9Cf7VTXPizKSea/zM8dO7JD+GU bXug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@massaru-org.20150623.gappssmtp.com header.s=20150623 header.b=KGN04Gs7; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u9si363629ejb.268.2020.05.26.11.36.23; Tue, 26 May 2020 11:36:47 -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=@massaru-org.20150623.gappssmtp.com header.s=20150623 header.b=KGN04Gs7; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729215AbgEZSen (ORCPT + 99 others); Tue, 26 May 2020 14:34:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728113AbgEZSen (ORCPT ); Tue, 26 May 2020 14:34:43 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF7EEC03E96D for ; Tue, 26 May 2020 11:34:41 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id q8so5228763qkm.12 for ; Tue, 26 May 2020 11:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=massaru-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X6aXjORE3d23i1StkTonhzGHIalGKnrHwR2gVaYOR1Q=; b=KGN04Gs7yNeKZzj8Lcyig10HxzNnFYhK42ZHpbQ7VNBeH5oOdHxr0avRB6BsoYRpdg HHf0NqmqHMxFxlPGrp/dyvpQBszyjEKVlw2KCc1XphtusuGVsAUn7O1bVuxVSvUHzDAO qDMbPlvkjYEKPQMSqNb3avW9ZnJ1JV677JoYBfxCY8u2Sr2CGJV7eb2fYyH7YyCp1xfS BvD8LhMMJltV/8TSjKAidYgKWQplesk60AeoWpiEIsKiT1shwbBy0mYHMo8JS2ky0+sA cMfCEn2PRi6ogyHzvbfD+0swY8H9NjiTzeEUn4ariY/8fTEGzx/HoNwF6w30WHKRhxEb fquw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X6aXjORE3d23i1StkTonhzGHIalGKnrHwR2gVaYOR1Q=; b=aKhkD0+9dJBGjMP5bAV02TgW5ACeIT83Xx2ZDzeYn7Fwgz6RpsAF2E64J2mPiv4FU/ esae6H2SL96z1V2p37nl8cTWwUFFsrnqIlUN8GVuPz4CzM029EUSuBdVdyba4/jTEwz+ aoe6pXdhhDmtMkuQ5gMFwaBntNlSyt4iSc+hRRKu+esQ6KYJcTIcqA1SCHqKuyoc5kSX 1idB2dFJRIJ7Q89bB+4jgEzSH4IKuNXJidmi66XU2zZDV06sMhtKYSln264g/LUQr4En +WoICS35yFrjbrq+RgFAP85rukVZhvlSx89FiT/iGuK5zZThjbKollEgYa7ntp8uY5gM +rhg== X-Gm-Message-State: AOAM532rHyVGGQbtaSF8fm/KrRaMVbbEndsgaeNr0kcCYfDWeeog41EJ dNXSWUw3+VRUsN73NPjvkywQew== X-Received: by 2002:a37:484e:: with SMTP id v75mr142237qka.79.1590518080875; Tue, 26 May 2020 11:34:40 -0700 (PDT) Received: from bbking.lan ([2804:14c:4a5:36c::cd2]) by smtp.gmail.com with ESMTPSA id l22sm342526qki.45.2020.05.26.11.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 11:34:40 -0700 (PDT) From: Vitor Massaru Iha To: kunit-dev@googlegroups.com, skhan@linuxfoundation.org Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, brendanhiggins@google.com, linux-kernel-mentees@lists.linuxfoundation.org Subject: [fixup] kunit: use --build_dir=.kunit as default Date: Tue, 26 May 2020 15:34:36 -0300 Message-Id: <20200526183436.47026-1-vitor@massaru.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To make KUnit easier to use, and to avoid overwriting object and .config files, the default KUnit build directory is set to .kunit * Related bug: https://bugzilla.kernel.org/show_bug.cgi?id=205221 Fixed up minor merge conflicts - Shuah Khan Signed-off-by: Vitor Massaru Iha Reviewed-by: Brendan Higgins Signed-off-by: Shuah Khan --- version after merge on kunit brach: * fix identation (tabs instead of spaces) --- tools/testing/kunit/kunit.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index b01838b6f5f9..b3490271a103 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -169,7 +169,7 @@ def add_common_opts(parser): parser.add_argument('--build_dir', help='As in the make command, it specifies the build ' 'directory.', - type=str, default='', metavar='build_dir') + type=str, default='.kunit', metavar='build_dir') parser.add_argument('--make_options', help='X=Y make option, can be repeated.', action='append') @@ -245,12 +245,11 @@ def main(argv, linux=None): cli_args = parser.parse_args(argv) if cli_args.subcommand == 'run': - if cli_args.build_dir: - if not os.path.exists(cli_args.build_dir): - os.mkdir(cli_args.build_dir) - kunit_kernel.kunitconfig_path = os.path.join( - cli_args.build_dir, - kunit_kernel.kunitconfig_path) + if not os.path.exists(cli_args.build_dir): + os.mkdir(cli_args.build_dir) + kunit_kernel.kunitconfig_path = os.path.join( + cli_args.build_dir, + kunit_kernel.kunitconfig_path) if not linux: linux = kunit_kernel.LinuxSourceTree() -- 2.26.2