diff mbox series

[3/4] test: Support test modules located in 'updates' instead of 'extra'

Message ID 168236638863.1027628.11883188611397194858.stgit@dwillia2-xfh.jf.intel.com
State Accepted
Commit e8d6d43177ebbf6fcfcd08e2f3a97345ade5679e
Headers show
Series cxl list and test fixes | expand

Commit Message

Dan Williams April 24, 2023, 7:59 p.m. UTC
Since kernel commit:

b74d7bb7ca24 ("kbuild: Modify default INSTALL_MOD_DIR from extra to updates")

...the kernel build process deposits the nfit_test can cxl_test modules in
/lib/modules/$KVER/updates. This is more widely supported across multiple
distributions as a default override for modules that ship in their native
directory.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
 test/core.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dave Jiang April 28, 2023, 4:05 p.m. UTC | #1
On 4/24/23 12:59 PM, Dan Williams wrote:
> Since kernel commit:
> 
> b74d7bb7ca24 ("kbuild: Modify default INSTALL_MOD_DIR from extra to updates")
> 
> ...the kernel build process deposits the nfit_test can cxl_test modules in

s/can/and/ ?

> /lib/modules/$KVER/updates. This is more widely supported across multiple
> distributions as a default override for modules that ship in their native
> directory.
> 
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>

> ---
>   test/core.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/test/core.c b/test/core.c
> index 5d1aa23723f1..a354f41dcba0 100644
> --- a/test/core.c
> +++ b/test/core.c
> @@ -209,7 +209,7 @@ retry:
>   			break;
>   		}
>   
> -		if (!strstr(path, "/extra/")) {
> +		if (!strstr(path, "/extra/") && !strstr(path, "/updates/")) {
>   			log_err(&log_ctx, "%s.ko: appears to be production version: %s\n",
>   					name, path);
>   			break;
> 
>
diff mbox series

Patch

diff --git a/test/core.c b/test/core.c
index 5d1aa23723f1..a354f41dcba0 100644
--- a/test/core.c
+++ b/test/core.c
@@ -209,7 +209,7 @@  retry:
 			break;
 		}
 
-		if (!strstr(path, "/extra/")) {
+		if (!strstr(path, "/extra/") && !strstr(path, "/updates/")) {
 			log_err(&log_ctx, "%s.ko: appears to be production version: %s\n",
 					name, path);
 			break;