summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/nettle
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-08-27 10:40:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-01 11:44:00 +0100
commit3a37c439c7abdc5b0d269b80192f1b8d327f8e11 (patch)
tree8db5414d11b77e17aa9b1b5830623bac9100120f /meta/recipes-support/nettle
parent38f4e92ab96fe472b3efc2d359a25a6916019c49 (diff)
downloadpoky-3a37c439c7abdc5b0d269b80192f1b8d327f8e11.tar.gz
nettle: Add ptests
Use the nettle testsuite as ptests. Skip "sha1-huge-test" because it can take 20 minutes to finish. (From OE-Core rev: 75839c401f319d4367cb1b9259d0931170212ec8) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nettle')
-rw-r--r--meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch46
-rw-r--r--meta/recipes-support/nettle/files/run-ptest36
-rw-r--r--meta/recipes-support/nettle/nettle.inc21
3 files changed, 101 insertions, 2 deletions
diff --git a/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
new file mode 100644
index 0000000000..23da777921
--- /dev/null
+++ b/meta/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch
@@ -0,0 +1,46 @@
1From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 12 Aug 2015 23:27:27 +0300
4Subject: [PATCH] Add target to only build tests (not run them)
5
6Not sending upstream as this is only a start of a solution to
7installable tests: It's useful for us already as is.
8
9Upstream-Status: Inappropriate [not a complete solution]
10
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12---
13 Makefile.in | 3 +++
14 testsuite/Makefile.in | 2 ++
15 2 files changed, 5 insertions(+)
16
17diff --git a/Makefile.in b/Makefile.in
18index 08efb7d..7909342 100644
19--- a/Makefile.in
20+++ b/Makefile.in
21@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags:
22 echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
23 $(MAKE) $@-here
24
25+buildtest:
26+ echo "Making $@ in testsuite" ; (cd testsuite && $(MAKE) $@)
27+
28 check-here:
29 true
30
31diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
32index 6bc1907..bb65bf0 100644
33--- a/testsuite/Makefile.in
34+++ b/testsuite/Makefile.in
35@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
36 # data.
37 VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
38
39+buildtest: $(TS_ALL)
40+
41 # The PATH update is for locating dlls on w*ndows.
42 check: $(TS_ALL)
43 LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
44--
452.1.4
46
diff --git a/meta/recipes-support/nettle/files/run-ptest b/meta/recipes-support/nettle/files/run-ptest
new file mode 100644
index 0000000000..b90bed66d2
--- /dev/null
+++ b/meta/recipes-support/nettle/files/run-ptest
@@ -0,0 +1,36 @@
1#! /bin/sh
2
3cd testsuite
4
5failed=0
6all=0
7
8for f in *-test; do
9 if [ "$f" = "sha1-huge-test" ] ; then
10 echo "SKIP: $f (skipped for ludicrous run time)"
11 continue
12 fi
13
14 "./$f"
15 case "$?" in
16 0)
17 echo "PASS: $f"
18 all=$((all + 1))
19 ;;
20 77)
21 echo "SKIP: $f"
22 ;;
23 *)
24 echo "FAIL: $f"
25 failed=$((failed + 1))
26 all=$((all + 1))
27 ;;
28 esac
29done
30
31if [ "$failed" -eq 0 ] ; then
32 echo "All $all tests passed"
33else
34 echo "$failed of $all tests failed"
35fi
36
diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc
index 0579b6c923..fafff6d8d9 100644
--- a/meta/recipes-support/nettle/nettle.inc
+++ b/meta/recipes-support/nettle/nettle.inc
@@ -8,19 +8,36 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 8
9DEPENDS += "gmp" 9DEPENDS += "gmp"
10 10
11SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz" 11SRC_URI = "http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz \
12 file://Add-target-to-only-build-tests-not-run-them.patch \
13 file://run-ptest \
14 "
12 15
13SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5" 16SRC_URI[md5sum] = "003d5147911317931dd453520eb234a5"
14SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40" 17SRC_URI[sha256sum] = "bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40"
15 18
16EXTRA_OECONF = "--disable-openssl" 19EXTRA_OECONF = "--disable-openssl"
17 20
21inherit autotools ptest
22
18do_configure_prepend() { 23do_configure_prepend() {
19 if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then 24 if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then
20 cp ${S}/aclocal.m4 ${S}/acinclude.m4 25 cp ${S}/aclocal.m4 ${S}/acinclude.m4
21 fi 26 fi
22} 27}
23 28
24inherit autotools 29do_compile_ptest() {
30 oe_runmake buildtest
31}
32
33do_install_ptest() {
34 install -d ${D}${PTEST_PATH}/testsuite/
35 install ${S}/testsuite/gold-bug.txt ${D}${PTEST_PATH}/testsuite/
36 install ${S}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
37 # tools can be found in PATH, not in ../tools/
38 sed -i -e 's|../tools/||' ${D}${PTEST_PATH}/testsuite/*-test
39 install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
40}
41
25 42
26BBCLASSEXTEND = "native nativesdk" 43BBCLASSEXTEND = "native nativesdk"