diff mbox series

[v2,3/4] test/libndctl: skip SMART tests on non-nfit devices

Message ID 20210225061303.654267-3-santosh@fossix.org (mailing list archive)
State New, archived
Headers show
Series [v2,1/4] test: Don't skip tests if nfit modules are missing | expand

Commit Message

Santosh Sivaraj Feb. 25, 2021, 6:13 a.m. UTC
This is just a temporary check till the new module has SMART capabilities
emulated.

Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
---
 test/libndctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Dan Williams Dec. 18, 2021, 4 p.m. UTC | #1
On Wed, Feb 24, 2021 at 10:13 PM Santosh Sivaraj <santosh@fossix.org> wrote:
>
> This is just a temporary check till the new module has SMART capabilities
> emulated.
>

Hey Vishal, one for the v73 queue...

> Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
> ---
>  test/libndctl.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/test/libndctl.c b/test/libndctl.c
> index 5043ae0..001f78a 100644
> --- a/test/libndctl.c
> +++ b/test/libndctl.c
> @@ -2427,7 +2427,8 @@ static int check_commands(struct ndctl_bus *bus, struct ndctl_dimm *dimm,
>          * The kernel did not start emulating v1.2 namespace spec smart data
>          * until 4.9.
>          */
> -       if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 9, 0)))
> +       if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 9, 0))
> +           || !ndctl_bus_has_nfit(bus))
>                 dimm_commands &= ~((1 << ND_CMD_SMART)
>                                 | (1 << ND_CMD_SMART_THRESHOLD));
>
> --
> 2.29.2
>
Verma, Vishal L Dec. 19, 2021, 3:34 a.m. UTC | #2
On Sat, 2021-12-18 at 08:00 -0800, Dan Williams wrote:
> On Wed, Feb 24, 2021 at 10:13 PM Santosh Sivaraj <santosh@fossix.org> wrote:
> > 
> > This is just a temporary check till the new module has SMART capabilities
> > emulated.
> > 
> 
> Hey Vishal, one for the v73 queue...
> 
> > Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
> > ---
> >  test/libndctl.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)

Hi Santosh - would you mind re-sending a rebased version of these? (and
anything else in your queue I may have missed). Apologies for the
delays in picking these up, but I can start picking up whatever was
missed now.

Thanks,
-Vishal

> > 
> > diff --git a/test/libndctl.c b/test/libndctl.c
> > index 5043ae0..001f78a 100644
> > --- a/test/libndctl.c
> > +++ b/test/libndctl.c
> > @@ -2427,7 +2427,8 @@ static int check_commands(struct ndctl_bus *bus, struct ndctl_dimm *dimm,
> >          * The kernel did not start emulating v1.2 namespace spec smart data
> >          * until 4.9.
> >          */
> > -       if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 9, 0)))
> > +       if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 9, 0))
> > +           || !ndctl_bus_has_nfit(bus))
> >                 dimm_commands &= ~((1 << ND_CMD_SMART)
> >                                 | (1 << ND_CMD_SMART_THRESHOLD));
> > 
> > --
> > 2.29.2
> > 
>
diff mbox series

Patch

diff --git a/test/libndctl.c b/test/libndctl.c
index 5043ae0..001f78a 100644
--- a/test/libndctl.c
+++ b/test/libndctl.c
@@ -2427,7 +2427,8 @@  static int check_commands(struct ndctl_bus *bus, struct ndctl_dimm *dimm,
 	 * The kernel did not start emulating v1.2 namespace spec smart data
 	 * until 4.9.
 	 */
-	if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 9, 0)))
+	if (!ndctl_test_attempt(test, KERNEL_VERSION(4, 9, 0))
+	    || !ndctl_bus_has_nfit(bus))
 		dimm_commands &= ~((1 << ND_CMD_SMART)
 				| (1 << ND_CMD_SMART_THRESHOLD));