[ptxdist] [PATCH v2 0/2] cmocka and packages depending on it

[ptxdist] [PATCH v2 0/2] cmocka and packages depending on it

[Alexander Dahl]

Hei hei,

I revised the implicit v1 and added a second patch. However, have a
close look at that one, compiling with OPENSC_TESTSUITE currently fails,
maybe the upcoming 0.20.0 (rc4 came out today) will fix that? I opened a
ticket for that: https://github.com/OpenSC/OpenSC/issues/1885

Greets
Alex

Alexander Dahl (2):
  cmocka: new package
  opensc: Reactivate testsuite option

 rules/cmocka.in   | 13 ++++++++++
 rules/cmocka.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 rules/opensc.in   |  4 ++--
 3 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 rules/cmocka.in
 create mode 100644 rules/cmocka.make

-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/2] cmocka: new package

[Alexander Dahl]

From: Alexander Dahl <ada@thorsis.com>

This adds the unit testing framework for C called 'cmocka'.

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

Notes:
    v1 -> v2:
        * use make $(basename …) for building URL from VERSION

 rules/cmocka.in   | 13 ++++++++++
 rules/cmocka.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 rules/cmocka.in
 create mode 100644 rules/cmocka.make

diff --git a/rules/cmocka.in b/rules/cmocka.in
new file mode 100644
index 000000000..d18cf00ff
--- /dev/null
+++ b/rules/cmocka.in
@@ -0,0 +1,13 @@
+## SECTION=test_suites
+
+config CMOCKA
+	tristate
+	prompt "cmocka"
+	select HOST_CMAKE
+	help
+	  cmocka is ... an elegant unit testing framework for C with
+	  support for mock objects. It only requires the standard C
+	  library, works on a range of computing platforms (including
+	  embedded) and with different compilers.
+
+# vim: ft=kconfig noet tw=72 ts=8 sw=8
diff --git a/rules/cmocka.make b/rules/cmocka.make
new file mode 100644
index 000000000..a25939bbe
--- /dev/null
+++ b/rules/cmocka.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Alexander Dahl <ada@thorsis.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_CMOCKA) += cmocka
+
+#
+# Paths and names
+#
+CMOCKA_VERSION		:= 1.1.5
+CMOCKA_MD5		:= 91f95cd5db88b9b120d191b18d367193
+CMOCKA			:= cmocka-$(CMOCKA_VERSION)
+CMOCKA_SUFFIX		:= tar.xz
+CMOCKA_URL		:= https://cmocka.org/files/$(basename $(CMOCKA_VERSION))/$(CMOCKA).$(CMOCKA_SUFFIX)
+CMOCKA_SOURCE		:= $(SRCDIR)/$(CMOCKA).$(CMOCKA_SUFFIX)
+CMOCKA_DIR		:= $(BUILDDIR)/$(CMOCKA)
+CMOCKA_LICENSE		:= Apache-2.0
+CMOCKA_LICENSE_FILES	:= file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+CMOCKA_CONF_TOOL	:= cmake
+CMOCKA_CONF_OPT		:= \
+	$(CROSS_CMAKE_USR) \
+	-DBUILD_TESTING=OFF \
+	-DPICKY_DEVELOPER:BOOL=OFF \
+	-DUNIT_TESTING:BOOL=OFF \
+	-DWITH_CMOCKERY_SUPPORT:BOOL=OFF \
+	-DWITH_EXAMPLES:BOOL=OFF \
+	-DWITH_STATIC_LIB=OFF
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/cmocka.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, cmocka)
+	@$(call install_fixup, cmocka,PRIORITY,optional)
+	@$(call install_fixup, cmocka,SECTION,base)
+	@$(call install_fixup, cmocka,AUTHOR,"Alexander Dahl <ada@thorsis.com>")
+	@$(call install_fixup, cmocka,DESCRIPTION,missing)
+
+	@$(call install_lib, cmocka, 0, 0, 0644, libcmocka)
+
+	@$(call install_finish, cmocka)
+
+	@$(call touch)
+
+# vim: ft=make noet tw=72 ts=8 sw=8
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/2] opensc: Reactivate testsuite option

[Alexander Dahl]

This allows to run prepare stage successfully, cmocka is found now, but
compile stage fails with opensc 0.19.0 because apparently a header file
'p11test_common.h' which is present in opensc git tree is missing in the
tarball …

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/opensc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/opensc.in b/rules/opensc.in
index eeda1e43d..6ebe64cf8 100644
--- a/rules/opensc.in
+++ b/rules/opensc.in
@@ -7,6 +7,7 @@ menuconfig OPENSC
 	select OPENCT		if OPENSC_OPENCT
 	select PCSC_LITE	if OPENSC_PCSC
 	select OPENSSL		if OPENSC_OPENSSL
+	select CMOCKA		if OPENSC_TESTSUITE
 	help
 	  Smart card utilities with support for PKCS#15 compatible cards
 
@@ -44,8 +45,7 @@ config OPENSC_TOOLS
 	bool "install tools"
 
 config OPENSC_TESTSUITE
-	# needs cmocka
-	depends on BROKEN
 	bool "install testsuite"
+	depends on OPENSC_OPENSSL
 
 endif
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2 2/2] opensc: Reactivate testsuite option

[Michael Olbrich]

On Thu, Dec 05, 2019 at 10:59:21PM +0100, Alexander Dahl wrote:
> This allows to run prepare stage successfully, cmocka is found now, but
> compile stage fails with opensc 0.19.0 because apparently a header file
> 'p11test_common.h' which is present in opensc git tree is missing in the
> tarball …
> 
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
>  rules/opensc.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/opensc.in b/rules/opensc.in
> index eeda1e43d..6ebe64cf8 100644
> --- a/rules/opensc.in
> +++ b/rules/opensc.in
> @@ -7,6 +7,7 @@ menuconfig OPENSC
>  	select OPENCT		if OPENSC_OPENCT
>  	select PCSC_LITE	if OPENSC_PCSC
>  	select OPENSSL		if OPENSC_OPENSSL
> +	select CMOCKA		if OPENSC_TESTSUITE
>  	help
>  	  Smart card utilities with support for PKCS#15 compatible cards
>  
> @@ -44,8 +45,7 @@ config OPENSC_TOOLS
>  	bool "install tools"
>  
>  config OPENSC_TESTSUITE
> -	# needs cmocka
> -	depends on BROKEN
>  	bool "install testsuite"
> +	depends on OPENSC_OPENSSL

I'd prefer a 'select OPENSC_OPENSSL' here.

Michael

>  
>  endif
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de