[ptxdist] [PATCH] mtd-utils: Add option to build and install test tools

[ptxdist] [PATCH] mtd-utils: Add option to build and install test tools

[Alexander Dahl]

Those tools are only needed in development for testing and debugging.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---

Notes:
    I had this lying around since 2018, and now needed it again to
    investigate a UBIFS issue on raw NAND flash.
    Maybe it's helpful to someone else, too?!

 rules/mtd-utils.in   |  8 ++++++++
 rules/mtd-utils.make | 18 +++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index bd7ce9449..c3b8bb29b 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -396,4 +396,12 @@ config MTD_UTILS_MTDINFO
 
 endif
 
+config MTD_UTILS_TESTS
+    bool
+    prompt "MTD test programs"
+    help
+      MTD test-suite with the following, potentially dangerous, test
+      programs: nandbiterrs, flash_speed, flash_stress, flash_readtest,
+      nandpagetest, nandsubpagetest, and flash_torture.
+
 endif
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index a049e9896..d14f4356e 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -35,7 +35,7 @@ MTD_UTILS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-unit-tests \
 	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-tests \
+	--$(call ptx/endis,PTXCONF_MTD_UTILS_TESTS)-tests \
 	--$(call ptx/endis,PTXCONF_MTD_UTILS_UBIHEALTHD)-ubihealthd \
 	--$(call ptx/endis, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \
 	--$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \
@@ -256,6 +256,22 @@ ifdef PTXCONF_MTD_UTILS_MTDINFO
 	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
 		/usr/sbin/mtdinfo)
 endif
+ifdef PTXCONF_MTD_UTILS_TESTS
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/nandbiterrs)
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/flash_speed)
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/flash_stress)
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/flash_readtest)
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/nandpagetest)
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/nandsubpagetest)
+	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+		/usr/libexec/mtd-utils/flash_torture)
+endif
 
 	@$(call install_finish, mtd-utils)
 

base-commit: 114887419025a5b377c94f0443b8320989f3c736
-- 
2.30.2

Re: [ptxdist] [APPLIED] mtd-utils: Add option to build and install test tools

[Michael Olbrich]

Thanks, applied as 03d91ca869141bc3dca7f4715f52990d35d6ddcd.

Michael

[sent from post-receive hook]

On Fri, 10 Jun 2022 08:49:24 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Those tools are only needed in development for testing and debugging.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220601104838.24007-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
> index bd7ce94493e5..c3b8bb29b97a 100644
> --- a/rules/mtd-utils.in
> +++ b/rules/mtd-utils.in
> @@ -396,4 +396,12 @@ config MTD_UTILS_MTDINFO
>  
>  endif
>  
> +config MTD_UTILS_TESTS
> +    bool
> +    prompt "MTD test programs"
> +    help
> +      MTD test-suite with the following, potentially dangerous, test
> +      programs: nandbiterrs, flash_speed, flash_stress, flash_readtest,
> +      nandpagetest, nandsubpagetest, and flash_torture.
> +
>  endif
> diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
> index a049e9896678..d14f4356eef1 100644
> --- a/rules/mtd-utils.make
> +++ b/rules/mtd-utils.make
> @@ -35,7 +35,7 @@ MTD_UTILS_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-unit-tests \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
> -	--disable-tests \
> +	--$(call ptx/endis,PTXCONF_MTD_UTILS_TESTS)-tests \
>  	--$(call ptx/endis,PTXCONF_MTD_UTILS_UBIHEALTHD)-ubihealthd \
>  	--$(call ptx/endis, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \
>  	--$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \
> @@ -256,6 +256,22 @@ ifdef PTXCONF_MTD_UTILS_MTDINFO
>  	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
>  		/usr/sbin/mtdinfo)
>  endif
> +ifdef PTXCONF_MTD_UTILS_TESTS
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/nandbiterrs)
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/flash_speed)
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/flash_stress)
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/flash_readtest)
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/nandpagetest)
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/nandsubpagetest)
> +	@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> +		/usr/libexec/mtd-utils/flash_torture)
> +endif
>  
>  	@$(call install_finish, mtd-utils)
>