| Message ID | 20200729152113.1250-1-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | common/multipath-over-rdma: make block scheduler directory optional | expand |
Hi Luis, [cc: Omar] blktests patches should have a 'PATCH blktests' subject prefix. On Wed, Jul 29, 2020 at 03:21:13PM +0000, Luis Chamberlain wrote: > We currently fail if the following tests if the directory > /lib/modules/$(uname -r)/kernel/block does not exist. Just make > this optional. Older distributions won't have this directory. It's not just older distributions. If the I/O schedulers are build in there wont be any block directory. > srp/001 > srp/002 > srp/013 > srp/014 > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: Daniel Wagner <dwagner@suse.de>
On Wed, Jul 29, 2020 at 03:21:13PM +0000, Luis Chamberlain wrote: > We currently fail if the following tests if the directory > /lib/modules/$(uname -r)/kernel/block does not exist. Just make > this optional. Older distributions won't have this directory. > > srp/001 > srp/002 > srp/013 > srp/014 > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > --- > common/multipath-over-rdma | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma > index 676d283..f004124 100644 > --- a/common/multipath-over-rdma > +++ b/common/multipath-over-rdma > @@ -696,10 +696,13 @@ setup_test() { > > # Load the I/O scheduler kernel modules > ( > - cd "/lib/modules/$(uname -r)/kernel/block" && > - for m in *.ko; do > - [ -e "$m" ] && modprobe "${m%.ko}" > - done > + KERNEL_BLOCK="/lib/modules/$(uname -r)/kernel/block" > + if [ -d $KERNEL_BLOCK ]; then > + cd $KERNEL_BLOCK && This has a couple of shellcheck errors about unquoted variables. Fixed those up and applied, thanks. > + for m in *.ko; do > + [ -e "$m" ] && modprobe "${m%.ko}" > + done > + fi > ) > > if [ -d /sys/kernel/debug/dynamic_debug ]; then > -- > 2.27.0 >
diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma index 676d283..f004124 100644 --- a/common/multipath-over-rdma +++ b/common/multipath-over-rdma @@ -696,10 +696,13 @@ setup_test() { # Load the I/O scheduler kernel modules ( - cd "/lib/modules/$(uname -r)/kernel/block" && - for m in *.ko; do - [ -e "$m" ] && modprobe "${m%.ko}" - done + KERNEL_BLOCK="/lib/modules/$(uname -r)/kernel/block" + if [ -d $KERNEL_BLOCK ]; then + cd $KERNEL_BLOCK && + for m in *.ko; do + [ -e "$m" ] && modprobe "${m%.ko}" + done + fi ) if [ -d /sys/kernel/debug/dynamic_debug ]; then
We currently fail if the following tests if the directory /lib/modules/$(uname -r)/kernel/block does not exist. Just make this optional. Older distributions won't have this directory. srp/001 srp/002 srp/013 srp/014 Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- common/multipath-over-rdma | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)