| Message ID | 20240224050658.930272-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b819a8481a19043ca990980dd56b1a41389c665c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] selftests: netdevsim: be less selective for FW for the devlink test | expand |
Sat, Feb 24, 2024 at 06:06:58AM CET, kuba@kernel.org wrote: >Commit 6151ff9c7521 ("selftests: netdevsim: use suitable existing dummy >file for flash test") introduced a nice trick to the devlink flashing >test. Instead of user having to create a file under /lib/firmware >we just pick the first one that already exists. > >Sadly, in AWS Linux there are no files directly under /lib/firmware, Ah :) >only in subdirectories. Don't limit the search to -maxdepth 1. >We can use the %P print format to get the correct path for files >inside subdirectories: > >$ find /lib/firmware -type f -printf '%P\n' | head -1 >intel-ucode/06-1a-05 > >The full path is /lib/firmware/intel-ucode/06-1a-05 > >This works in GNU find, busybox doesn't have printf at all, >so we're not making it worse. > >Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Hello: This patch was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Fri, 23 Feb 2024 21:06:58 -0800 you wrote: > Commit 6151ff9c7521 ("selftests: netdevsim: use suitable existing dummy > file for flash test") introduced a nice trick to the devlink flashing > test. Instead of user having to create a file under /lib/firmware > we just pick the first one that already exists. > > Sadly, in AWS Linux there are no files directly under /lib/firmware, > only in subdirectories. Don't limit the search to -maxdepth 1. > We can use the %P print format to get the correct path for files > inside subdirectories: > > [...] Here is the summary with links: - [net-next] selftests: netdevsim: be less selective for FW for the devlink test https://git.kernel.org/netdev/net-next/c/b819a8481a19 You are awesome, thank you!
diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh index 46e20b13473c..b5ea2526f23c 100755 --- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh +++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh @@ -31,7 +31,7 @@ devlink_wait() fw_flash_test() { - DUMMYFILE=$(find /lib/firmware -maxdepth 1 -type f -printf '%f\n' |head -1) + DUMMYFILE=$(find /lib/firmware -type f -printf '%P\n' | head -1) RET=0 if [ -z "$DUMMYFILE" ]
Commit 6151ff9c7521 ("selftests: netdevsim: use suitable existing dummy file for flash test") introduced a nice trick to the devlink flashing test. Instead of user having to create a file under /lib/firmware we just pick the first one that already exists. Sadly, in AWS Linux there are no files directly under /lib/firmware, only in subdirectories. Don't limit the search to -maxdepth 1. We can use the %P print format to get the correct path for files inside subdirectories: $ find /lib/firmware -type f -printf '%P\n' | head -1 intel-ucode/06-1a-05 The full path is /lib/firmware/intel-ucode/06-1a-05 This works in GNU find, busybox doesn't have printf at all, so we're not making it worse. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- tools/testing/selftests/drivers/net/netdevsim/devlink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)