diff options
-rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 1 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl/disable-tests | 28 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl/run-ptest | 6 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_7.84.0.bb | 21 |
4 files changed, 55 insertions, 1 deletions
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index a1ead90649..6c4339e3e1 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
@@ -81,6 +81,7 @@ PTESTS_SLOW = "\ | |||
81 | babeltrace2-ptest \ | 81 | babeltrace2-ptest \ |
82 | busybox-ptest \ | 82 | busybox-ptest \ |
83 | coreutils-ptest \ | 83 | coreutils-ptest \ |
84 | curl-ptest \ | ||
84 | dbus-ptest \ | 85 | dbus-ptest \ |
85 | e2fsprogs-ptest \ | 86 | e2fsprogs-ptest \ |
86 | findutils-ptest \ | 87 | findutils-ptest \ |
diff --git a/meta/recipes-support/curl/curl/disable-tests b/meta/recipes-support/curl/curl/disable-tests new file mode 100644 index 0000000000..92056bd8ca --- /dev/null +++ b/meta/recipes-support/curl/curl/disable-tests | |||
@@ -0,0 +1,28 @@ | |||
1 | # These CRL test (alt-avc) are failing | ||
2 | 356 | ||
3 | 412 | ||
4 | 413 | ||
5 | # These CRL tests are scanning docs | ||
6 | 971 | ||
7 | 1119 | ||
8 | 1132 | ||
9 | 1135 | ||
10 | # These CRL tests are scnning headers | ||
11 | 1167 | ||
12 | # These CRL tests are scanning man pages | ||
13 | 1139 | ||
14 | 1140 | ||
15 | 1173 | ||
16 | 1177 | ||
17 | # This CRL test is looking for m4 files | ||
18 | 1165 | ||
19 | # This CRL test is looking for src files | ||
20 | 1185 | ||
21 | # These CRL tests need --libcurl option to be enabled | ||
22 | 1400 | ||
23 | 1401 | ||
24 | 1402 | ||
25 | 1403 | ||
26 | 1404 | ||
27 | 1405 | ||
28 | 1465 | ||
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest new file mode 100644 index 0000000000..614e822922 --- /dev/null +++ b/meta/recipes-support/curl/curl/run-ptest | |||
@@ -0,0 +1,6 @@ | |||
1 | #!/bin/sh | ||
2 | cd tests | ||
3 | ./runtests.pl -a -n -s | sed \ | ||
4 | -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ | ||
5 | -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ | ||
6 | -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//' | ||
diff --git a/meta/recipes-support/curl/curl_7.84.0.bb b/meta/recipes-support/curl/curl_7.84.0.bb index 74a19d20c9..0d829cdf23 100644 --- a/meta/recipes-support/curl/curl_7.84.0.bb +++ b/meta/recipes-support/curl/curl_7.84.0.bb | |||
@@ -12,13 +12,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" | |||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | https://curl.se/download/${BP}.tar.xz \ | 13 | https://curl.se/download/${BP}.tar.xz \ |
14 | file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ | 14 | file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ |
15 | file://run-ptest \ | ||
16 | file://disable-tests \ | ||
15 | " | 17 | " |
16 | SRC_URI[sha256sum] = "2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8" | 18 | SRC_URI[sha256sum] = "2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8" |
17 | 19 | ||
18 | # Curl has used many names over the years... | 20 | # Curl has used many names over the years... |
19 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" | 21 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" |
20 | 22 | ||
21 | inherit autotools pkgconfig binconfig multilib_header | 23 | inherit autotools pkgconfig binconfig multilib_header ptest |
22 | 24 | ||
23 | # Entropy source for random PACKAGECONFIG option | 25 | # Entropy source for random PACKAGECONFIG option |
24 | RANDOM ?= "/dev/urandom" | 26 | RANDOM ?= "/dev/urandom" |
@@ -83,6 +85,23 @@ do_install:append:class-target() { | |||
83 | ${D}${bindir}/curl-config | 85 | ${D}${bindir}/curl-config |
84 | } | 86 | } |
85 | 87 | ||
88 | do_compile_ptest() { | ||
89 | oe_runmake test | ||
90 | oe_runmake -C ${B}/tests/server | ||
91 | } | ||
92 | |||
93 | do_install_ptest() { | ||
94 | cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED | ||
95 | rm ${B}/tests/configurehelp.pm | ||
96 | cp -rf ${B}/tests ${D}${PTEST_PATH} | ||
97 | cp -rf ${S}/tests ${D}${PTEST_PATH} | ||
98 | install -d ${D}${PTEST_PATH}/src | ||
99 | ln -sf ${bindir}/curl ${D}${PTEST_PATH}/src/curl | ||
100 | cp -rf ${D}${bindir}/curl-config ${D}${PTEST_PATH} | ||
101 | } | ||
102 | |||
103 | RDEPENDS:${PN}-ptest += "bash perl-modules" | ||
104 | |||
86 | PACKAGES =+ "lib${BPN}" | 105 | PACKAGES =+ "lib${BPN}" |
87 | 106 | ||
88 | FILES:lib${BPN} = "${libdir}/lib*.so.*" | 107 | FILES:lib${BPN} = "${libdir}/lib*.so.*" |