Patchwork [V2,1/1] beecrypt: add ptest support

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date Jan. 6, 2014, 2:57 a.m.
Message ID <e6254f1b673b690c77c1e51e63e4d6d5011c7aff.1388976868.git.Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/64113/
State New
Headers show

Comments

Chong.Lu@windriver.com - Jan. 6, 2014, 2:57 a.m.
Install beecrypt test suite and run it as ptest.
Make all ptest pass.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 .../beecrypt/beecrypt/enable-ptest.patch           | 22 ++++++++++++++++++++++
 meta/recipes-support/beecrypt/beecrypt/run-ptest   |  5 +++++
 meta/recipes-support/beecrypt/beecrypt_4.2.1.bb    | 12 ++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch
 create mode 100644 meta/recipes-support/beecrypt/beecrypt/run-ptest
Richard Purdie - Jan. 6, 2014, 12:08 p.m.
On Mon, 2014-01-06 at 10:57 +0800, Chong Lu wrote:
> Install beecrypt test suite and run it as ptest.
> Make all ptest pass.
> 
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>  .../beecrypt/beecrypt/enable-ptest.patch           | 22 ++++++++++++++++++++++
>  meta/recipes-support/beecrypt/beecrypt/run-ptest   |  5 +++++
>  meta/recipes-support/beecrypt/beecrypt_4.2.1.bb    | 12 ++++++++++--
>  3 files changed, 37 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch
>  create mode 100644 meta/recipes-support/beecrypt/beecrypt/run-ptest
> 
> diff --git a/meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch b/meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch
> new file mode 100644
> index 0000000..f66ea1b
> --- /dev/null

There is no patch header here (Upstream-Status, Author or description)

Cheers,

Richard

> +++ b/meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch
> @@ -0,0 +1,22 @@
> +diff --git a/Makefile.am b/Makefile.am
> +index b7e7869..9fed3c2 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -73,3 +73,6 @@ DISTCLEANFILES = mpopt.s blowfishopt.s sha1opt.s
> + 
> + bench:
> + 	(cd tests && $(MAKE) $(AM_MAKEFLAGS) bench)
> ++
> ++install-ptest:
> ++	(cd tests && $(MAKE) $(AM_MAKEFLAGS) check_PROGRAMS)
> +diff --git a/tests/Makefile.am b/tests/Makefile.am
> +index 1604e5e..37fb316 100644
> +--- a/tests/Makefile.am
> ++++ b/tests/Makefile.am
> +@@ -101,3 +101,6 @@ bench: benchme benchrsa benchhf benchbc
> + 	./benchbc AES 128
> + 	./benchbc Blowfish 128
> + 	./benchbc Blowfish 128
> ++
> ++check_PROGRAMS:
> ++	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
> diff --git a/meta/recipes-support/beecrypt/beecrypt/run-ptest b/meta/recipes-support/beecrypt/beecrypt/run-ptest
> new file mode 100644
> index 0000000..5bc7460
> --- /dev/null
> +++ b/meta/recipes-support/beecrypt/beecrypt/run-ptest
> @@ -0,0 +1,5 @@
> +#!/bin/sh
> +
> +cd tests
> +for i in `ls`; do ./$i; if [ $? == 0 ]; then echo "PASS: $i"; \
> +    else echo "FAIL: $i"; fi; done
> diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> index 5874f9e..3c7cdd2 100644
> --- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> +++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
> @@ -7,7 +7,10 @@ HOMEPAGE="http://sourceforge.net/projects/beecrypt"
>  SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
>  	 file://disable-icu-check.patch \
>  	 file://fix-security.patch \
> -         file://fix-for-gcc-4.7.patch"
> +         file://fix-for-gcc-4.7.patch \
> +         file://run-ptest \
> +         file://enable-ptest.patch \
> +"
>  
>  SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
>  SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
> @@ -18,7 +21,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
>  
>  PR = "r3"
>  
> -inherit autotools multilib_header
> +inherit autotools multilib_header ptest
>  acpaths=""
>  
>  do_install_append() {
> @@ -35,3 +38,8 @@ FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
>  FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a"
>  
>  BBCLASSEXTEND = "native nativesdk"
> +
> +do_install_ptest () {
> +	mkdir ${D}${PTEST_PATH}/tests
> +	cp -r ${B}/tests/.libs/test* ${D}${PTEST_PATH}/tests
> +}

Patch

diff --git a/meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch b/meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch
new file mode 100644
index 0000000..f66ea1b
--- /dev/null
+++ b/meta/recipes-support/beecrypt/beecrypt/enable-ptest.patch
@@ -0,0 +1,22 @@ 
+diff --git a/Makefile.am b/Makefile.am
+index b7e7869..9fed3c2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -73,3 +73,6 @@ DISTCLEANFILES = mpopt.s blowfishopt.s sha1opt.s
+ 
+ bench:
+ 	(cd tests && $(MAKE) $(AM_MAKEFLAGS) bench)
++
++install-ptest:
++	(cd tests && $(MAKE) $(AM_MAKEFLAGS) check_PROGRAMS)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 1604e5e..37fb316 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -101,3 +101,6 @@ bench: benchme benchrsa benchhf benchbc
+ 	./benchbc AES 128
+ 	./benchbc Blowfish 128
+ 	./benchbc Blowfish 128
++
++check_PROGRAMS:
++	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
diff --git a/meta/recipes-support/beecrypt/beecrypt/run-ptest b/meta/recipes-support/beecrypt/beecrypt/run-ptest
new file mode 100644
index 0000000..5bc7460
--- /dev/null
+++ b/meta/recipes-support/beecrypt/beecrypt/run-ptest
@@ -0,0 +1,5 @@ 
+#!/bin/sh
+
+cd tests
+for i in `ls`; do ./$i; if [ $? == 0 ]; then echo "PASS: $i"; \
+    else echo "FAIL: $i"; fi; done
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 5874f9e..3c7cdd2 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -7,7 +7,10 @@  HOMEPAGE="http://sourceforge.net/projects/beecrypt"
 SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \
 	 file://disable-icu-check.patch \
 	 file://fix-security.patch \
-         file://fix-for-gcc-4.7.patch"
+         file://fix-for-gcc-4.7.patch \
+         file://run-ptest \
+         file://enable-ptest.patch \
+"
 
 SRC_URI[md5sum] = "8441c014170823f2dff97e33df55af1e"
 SRC_URI[sha256sum] = "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
@@ -18,7 +21,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
 
 PR = "r3"
 
-inherit autotools multilib_header
+inherit autotools multilib_header ptest
 acpaths=""
 
 do_install_append() {
@@ -35,3 +38,8 @@  FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
 FILES_${PN}-staticdev += "${libdir}/${BPN}/*.a"
 
 BBCLASSEXTEND = "native nativesdk"
+
+do_install_ptest () {
+	mkdir ${D}${PTEST_PATH}/tests
+	cp -r ${B}/tests/.libs/test* ${D}${PTEST_PATH}/tests
+}