| Message ID | 158327631566.2222444.16879386597302511191.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b7991dbc22f31d03a38f3ee2dca4446fb55279e3 |
| Headers | show |
| Series | [ndctl,v2,1/2] ndctl/test: Cleanup test-vs-production nvdimm module detection | expand |
On Tue 03-03-20 14:58:35, Dan Williams wrote: > While there are some tests that require the new "dax-bus" device model, > none of the tests require compatibility mode. Drop the requirement so > the tests work with DEV_DAX_PMEM_COMPAT=n kernels. > > Link: http://lore.kernel.org/r/20200123154720.12097-1-jack@suse.cz > Cc: Jan Kara <jack@suse.cz> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > test/core.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/test/core.c b/test/core.c > index 3aa746fe6786..5118d86483d4 100644 > --- a/test/core.c > +++ b/test/core.c > @@ -180,6 +180,14 @@ int nfit_test_init(struct kmod_ctx **ctx, struct kmod_module **mod, > > retry: > rc = kmod_module_new_from_name(*ctx, name, mod); > + > + /* > + * dax_pmem_compat is not required, missing is ok, > + * present-but-production is not ok. > + */ > + if (rc && strcmp(name, "dax_pmem_compat") == 0) > + continue; > + > if (rc) { > log_err(&log_ctx, "%s.ko: missing\n", name); > break; >
diff --git a/test/core.c b/test/core.c index 3aa746fe6786..5118d86483d4 100644 --- a/test/core.c +++ b/test/core.c @@ -180,6 +180,14 @@ int nfit_test_init(struct kmod_ctx **ctx, struct kmod_module **mod, retry: rc = kmod_module_new_from_name(*ctx, name, mod); + + /* + * dax_pmem_compat is not required, missing is ok, + * present-but-production is not ok. + */ + if (rc && strcmp(name, "dax_pmem_compat") == 0) + continue; + if (rc) { log_err(&log_ctx, "%s.ko: missing\n", name); break;
While there are some tests that require the new "dax-bus" device model, none of the tests require compatibility mode. Drop the requirement so the tests work with DEV_DAX_PMEM_COMPAT=n kernels. Link: http://lore.kernel.org/r/20200123154720.12097-1-jack@suse.cz Cc: Jan Kara <jack@suse.cz> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- test/core.c | 8 ++++++++ 1 file changed, 8 insertions(+)