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=-22.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 1FB65C2B9F4 for ; Fri, 25 Jun 2021 17:24:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F13AC6198F for ; Fri, 25 Jun 2021 17:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229653AbhFYR1T (ORCPT ); Fri, 25 Jun 2021 13:27:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229586AbhFYR1S (ORCPT ); Fri, 25 Jun 2021 13:27:18 -0400 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A3D6C061766 for ; Fri, 25 Jun 2021 10:24:58 -0700 (PDT) Received: by mail-io1-xd35.google.com with SMTP id s19so13361449ioc.3 for ; Fri, 25 Jun 2021 10:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=LHVmYb7qh3Gk1c+JxsgnaWrjMoM5mdAbEnRvagWc1KA=; b=Vn6YZq1cCY8udPYJU/K7YC2O0uC6ZOyupMUqjLfo2UpZFbFSiYYmfiGSa6ZqnHujxj BgM9v2i47yquTml742aY3dJI4Vs1knz2wQhGyE9zf52unG7g+npayk8DEcDBT+kUq35c 1sRVRMw4h0hDZbWhsBR8tLXecirUHAikuY7Ps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=LHVmYb7qh3Gk1c+JxsgnaWrjMoM5mdAbEnRvagWc1KA=; b=DNVqbeTg2pdOLRxLo8OuXZ8/QQIMvMKCCScrAR6XXAm53KXiF06cOKfOzjB07QyHaN 77XF5lFvpseayYocKcolkaqtef0J340wCd3GResnHqbR5fRWn05M1twaQp6P9VqPw7+Q WrnilJSPGac8dX8H8tadHaSJ1kFvoVk5n2UlAZ44vVv7DLnvV+r0fkG11RgELXR6vf6F jrKXhek6kUybwzSacVDjUBQBaIVg8Yk53mqMrThZjjpMSN5wNeXKK+CETcOxB5tz/PEP E64kLIAsUDM40mtdGTjf3Dzq4G8mfhEOUsZTpfMc/8LihN/3vCq/NJvVMFZ1dgGvtdHW auTw== X-Gm-Message-State: AOAM533VSvFpX7nwQ8gSDtOmBv95VQUVtawwGn+mRwD+vJqNTO1FJJyf 98lhMFZmhG5rTGQ21BZfoBSfBw== X-Google-Smtp-Source: ABdhPJxLsh8wAcDMpoCUmXN/zrDNKEJlixdqAZQjj3+dTefpBtHhGQ3rKeWoiaeCyxMvY3i9x3JtkA== X-Received: by 2002:a02:a99e:: with SMTP id q30mr10393187jam.69.1624641897011; Fri, 25 Jun 2021 10:24:57 -0700 (PDT) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id m184sm3600828ioa.17.2021.06.25.10.24.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Jun 2021 10:24:56 -0700 (PDT) Subject: Re: [PATCH] kunit: Fix merge issue in suite filtering test To: Daniel Latypov Cc: David Gow , Brendan Higgins , kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot , Shuah Khan References: <20210625111603.358518-1-davidgow@google.com> <99c2564c-4175-7e3e-84c3-3bcb6d4f9d58@linuxfoundation.org> From: Shuah Khan Message-ID: Date: Fri, 25 Jun 2021 11:24:55 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On 6/25/21 11:08 AM, Daniel Latypov wrote: > On Fri, Jun 25, 2021 at 9:11 AM Shuah Khan wrote: >> >> On 6/25/21 5:16 AM, David Gow wrote: >>> There were a couple of errors introuced when >>> "kunit: add unit test for filtering suites by names"[1] was merged in >>> c9d80ffc5a. >>> >>> An erroneous '+' was introduced in executor.c, and the executor_test.c >>> file went missing. This causes the kernel to fail to compile if >>> CONFIG_KUNIT is enabled, as reported in [2,3]. >>> >>> As with the original, I've tested by running just the new tests using >>> itself: >>> $ ./tools/testing/kunit/kunit.py run '*exec*' >>> >>> [1]: https://lore.kernel.org/linux-kselftest/20210421020427.2384721-1-dlatypov@google.com/ >>> [2]: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/6IKQX5JXZF7I3NFH4IAWUMHXEQSCPNDP/ >>> [3]: https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/thread/EKY7ZH5YDCCTSJF2G7XFPMGIXQSUVD3Y/ >>> >>> Fixes: c9d80ffc5a ("kunit: add unit test for filtering suites by names") >>> Reported-by: kernel test robot >>> Signed-off-by: David Gow >>> --- >>> >>> This is another fix for the kunit-fixes branch, where there seems to >>> have been an issue merging the "kunit: add unit test for filtering >>> suites by names" patch here: >>> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/commit/?h=kunit-fixes&id=c9d80ffc5a0a30955de0b8c5c46a05906d417800 >>> >>> Again, feel free to squash this into the original patch if that works >>> better. >>> >> >> Thank you. My bad. Applied to kunit-fixes now. > > Hmm, it looks like executor_test.c might not have made it into kunit-fixes. > I believe this is the applied version of this patch: > > $ git show d833ce7480864d4d7eb2dbb04320858be3578b2a --stat > commit d833ce7480864d4d7eb2dbb04320858be3578b2a > Author: David Gow > Date: Fri Jun 25 04:16:03 2021 -0700 > > kunit: Fix merge issue in suite filtering test > ... > lib/kunit/executor.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > The result looks like this: > $ ./tools/testing/kunit/kunit.py run > ... > $ make ARCH=um --jobs=8 O=.kunit > ERROR:root:../lib/kunit/executor.c:140:10: fatal error: > executor_test.c: No such file or directory > 140 | #include "executor_test.c" > | ^~~~~~~~~~~~~~~~~ > > > I just `git am` or something just really doesn't like executor_test.c :) > > My mistake it looks like in merging the patch. I had to fix merge conflicts and made a mistake. I will fix it now. Odd that my local compile didn't catch the problem. I used the tools/testing/kunit/kunit.py build thanks, -- Shuah