On Fri, Jun 25, 2021 at 9:11 AM Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxx/ > > [2]: https://lists.01.org/hyperkitty/list/kbuild-all@xxxxxxxxxxxx/thread/6IKQX5JXZF7I3NFH4IAWUMHXEQSCPNDP/ > > [3]: https://lists.01.org/hyperkitty/list/kbuild-all@xxxxxxxxxxxx/thread/EKY7ZH5YDCCTSJF2G7XFPMGIXQSUVD3Y/ > > > > Fixes: c9d80ffc5a ("kunit: add unit test for filtering suites by names") > > Reported-by: kernel test robot <lkp@xxxxxxxxx> > > Signed-off-by: David Gow <davidgow@xxxxxxxxxx> > > --- > > > > 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 <davidgow@xxxxxxxxxx> 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 :) > > > > thanks, > > -- Shuah > > -- > You received this message because you are subscribed to the Google Groups "KUnit Development" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@xxxxxxxxxxxxxxxx. > To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/99c2564c-4175-7e3e-84c3-3bcb6d4f9d58%40linuxfoundation.org.
