[ptxdist] [PATCH] ecryptfs-utils: provide option for test scripts

[ptxdist] [PATCH] ecryptfs-utils: provide option for test scripts

[Oleksij Rempel]

This scripts are desined for kernel fs/ecryptfs testing.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 rules/ecryptfs-utils.in   |  3 +++
 rules/ecryptfs-utils.make | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in
index e73dafdf..06cb5561 100644
--- a/rules/ecryptfs-utils.in
+++ b/rules/ecryptfs-utils.in
@@ -44,4 +44,7 @@ config ECRYPTFS_UTILS_ECRYPTFS_UNWRAP_PASSPHRASE
 config ECRYPTFS_UTILS_ECRYPTFS_WRAP_PASSPHRASE
 	bool "ecryptfs-wrap-passphrase"
 
+config ECRYPTFS_UTILS_TESTS
+	bool "ecryptfs-tests"
+
 endif
diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
index 90ffd4d3..33a9cf54 100644
--- a/rules/ecryptfs-utils.make
+++ b/rules/ecryptfs-utils.make
@@ -46,9 +46,13 @@ ECRYPTFS_UTILS_CONF_OPT := \
 	--disable-gui \
 	--disable-docs \
 	--disable-docs-gen \
-	--disable-tests \
 	--disable-mudflap
 
+ifdef PTXCONF_ECRYPTFS_UTILS_TESTS
+ECRYPTFS_UTILS_CONF_OPT += \
+	--enable-tests
+endif
+
 ECRYPTFS_UTILS_PROGS_y :=
 
 ECRYPTFS_UTILS_PROGS_$(PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS)				+= /sbin/mount.ecryptfs
@@ -80,6 +84,10 @@ $(STATEDIR)/ecryptfs-utils.targetinstall:
 	@$(call install_lib, ecryptfs-utils, 0, 0, 0644, ecryptfs/libecryptfs_key_mod_passphrase)
 	@$(call install_lib, ecryptfs-utils, 0, 0, 0644, libecryptfs)
 
+ifdef PTXCONF_ECRYPTFS_UTILS_TESTS
+	@$(call install_tree, ecryptfs-utils, 0, 0, $(ECRYPTFS_UTILS_DIR)/tests, /usr/lib/ecryptfs/tests)
+endif
+
 ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS
 	@$(call install_link, ecryptfs-utils, mount.ecryptfs_private, /sbin/umount.ecryptfs_private)
 endif
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] ecryptfs-utils: provide option for test scripts

[Michael Olbrich]

On Wed, Apr 26, 2017 at 09:48:23AM +0200, Oleksij Rempel wrote:
> This scripts are desined for kernel fs/ecryptfs testing.

s/This/These/

> 
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  rules/ecryptfs-utils.in   |  3 +++
>  rules/ecryptfs-utils.make | 10 +++++++++-
>  2 files changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in
> index e73dafdf..06cb5561 100644
> --- a/rules/ecryptfs-utils.in
> +++ b/rules/ecryptfs-utils.in
> @@ -44,4 +44,7 @@ config ECRYPTFS_UTILS_ECRYPTFS_UNWRAP_PASSPHRASE
>  config ECRYPTFS_UTILS_ECRYPTFS_WRAP_PASSPHRASE
>  	bool "ecryptfs-wrap-passphrase"
>  
> +config ECRYPTFS_UTILS_TESTS
> +	bool "ecryptfs-tests"
> +
>  endif
> diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
> index 90ffd4d3..33a9cf54 100644
> --- a/rules/ecryptfs-utils.make
> +++ b/rules/ecryptfs-utils.make
> @@ -46,9 +46,13 @@ ECRYPTFS_UTILS_CONF_OPT := \
>  	--disable-gui \
>  	--disable-docs \
>  	--disable-docs-gen \
> -	--disable-tests \

Use ptx/endis to set the option here.

>  	--disable-mudflap
>  
> +ifdef PTXCONF_ECRYPTFS_UTILS_TESTS
> +ECRYPTFS_UTILS_CONF_OPT += \
> +	--enable-tests
> +endif
> +
>  ECRYPTFS_UTILS_PROGS_y :=
>  
>  ECRYPTFS_UTILS_PROGS_$(PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS)				+= /sbin/mount.ecryptfs
> @@ -80,6 +84,10 @@ $(STATEDIR)/ecryptfs-utils.targetinstall:
>  	@$(call install_lib, ecryptfs-utils, 0, 0, 0644, ecryptfs/libecryptfs_key_mod_passphrase)
>  	@$(call install_lib, ecryptfs-utils, 0, 0, 0644, libecryptfs)
>  
> +ifdef PTXCONF_ECRYPTFS_UTILS_TESTS
> +	@$(call install_tree, ecryptfs-utils, 0, 0, $(ECRYPTFS_UTILS_DIR)/tests, /usr/lib/ecryptfs/tests)
> +endif

Use install_glob to not install Makefile* and maybe others?

Michael

> +
>  ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS
>  	@$(call install_link, ecryptfs-utils, mount.ecryptfs_private, /sbin/umount.ecryptfs_private)
>  endif
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de