2023-07-09 11:17:28

by Benjamin Tissoires

[permalink] [raw]
Subject: [PATCH] selftests: hid: fix vmtests.sh not running make headers

According to commit 01d6c48a828b ("Documentation: kselftest:
"make headers" is a prerequisite"), running the kselftests requires
to run "make headers" first.

Do that in "vmtest.sh" as well to fix the HID CI.

Signed-off-by: Benjamin Tissoires <[email protected]>
---
Looks like the new master branch (v6.5-rc1) broke my CI.

And given that `make headers` is now a requisite to run the kselftests,
also include that command in vmtests.sh.

Broken CI job: https://gitlab.freedesktop.org/bentiss/hid/-/jobs/44704436
Fixed CI job: https://gitlab.freedesktop.org/bentiss/hid/-/jobs/45151040
---
tools/testing/selftests/hid/vmtest.sh | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/hid/vmtest.sh b/tools/testing/selftests/hid/vmtest.sh
index 681b906b4853..4da48bf6b328 100755
--- a/tools/testing/selftests/hid/vmtest.sh
+++ b/tools/testing/selftests/hid/vmtest.sh
@@ -79,6 +79,7 @@ recompile_kernel()
cd "${kernel_checkout}"

${make_command} olddefconfig
+ ${make_command} headers
${make_command}
}


---
base-commit: 0e382fa72bbf0610be40af9af9b03b0cd149df82
change-id: 20230709-fix-selftests-c8b0bdff1d20

Best regards,
--
Benjamin Tissoires <[email protected]>



2023-07-10 08:33:13

by Benjamin Tissoires

[permalink] [raw]
Subject: Re: [PATCH] selftests: hid: fix vmtests.sh not running make headers

On Sun, Jul 9, 2023 at 12:07 PM Benjamin Tissoires <[email protected]> wrote:
>
> According to commit 01d6c48a828b ("Documentation: kselftest:
> "make headers" is a prerequisite"), running the kselftests requires
> to run "make headers" first.
>
> Do that in "vmtest.sh" as well to fix the HID CI.
>
> Signed-off-by: Benjamin Tissoires <[email protected]>
> ---
> Looks like the new master branch (v6.5-rc1) broke my CI.
>
> And given that `make headers` is now a requisite to run the kselftests,
> also include that command in vmtests.sh.
>
> Broken CI job: https://gitlab.freedesktop.org/bentiss/hid/-/jobs/44704436
> Fixed CI job: https://gitlab.freedesktop.org/bentiss/hid/-/jobs/45151040

FWIW, I'm going to apply this one now given that otherwise all of the
CI is not working.

Cheers,
Benjamin

> ---
> tools/testing/selftests/hid/vmtest.sh | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tools/testing/selftests/hid/vmtest.sh b/tools/testing/selftests/hid/vmtest.sh
> index 681b906b4853..4da48bf6b328 100755
> --- a/tools/testing/selftests/hid/vmtest.sh
> +++ b/tools/testing/selftests/hid/vmtest.sh
> @@ -79,6 +79,7 @@ recompile_kernel()
> cd "${kernel_checkout}"
>
> ${make_command} olddefconfig
> + ${make_command} headers
> ${make_command}
> }
>
>
> ---
> base-commit: 0e382fa72bbf0610be40af9af9b03b0cd149df82
> change-id: 20230709-fix-selftests-c8b0bdff1d20
>
> Best regards,
> --
> Benjamin Tissoires <[email protected]>
>


2023-07-10 09:04:57

by Benjamin Tissoires

[permalink] [raw]
Subject: Re: [PATCH] selftests: hid: fix vmtests.sh not running make headers

On Sun, 09 Jul 2023 12:06:56 +0200, Benjamin Tissoires wrote:
> According to commit 01d6c48a828b ("Documentation: kselftest:
> "make headers" is a prerequisite"), running the kselftests requires
> to run "make headers" first.
>
> Do that in "vmtest.sh" as well to fix the HID CI.
>
>
> [...]

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git (for-6.5/upstream-fixes), thanks!

[1/1] selftests: hid: fix vmtests.sh not running make headers
https://git.kernel.org/hid/hid/c/f9abdcc617da

Cheers,
--
Benjamin Tissoires <[email protected]>