From 482a6c532c6d997f83b224c47356b3bddfaa9bf9 Mon Sep 17 00:00:00 2001 From: Qiu Tingting Date: Fri, 21 Jul 2023 11:06:21 +0800 Subject: [PATCH] curl: Add ptest support Add a ptest for curl. It is a backport for http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-support/curl?id=a0ea00daace826129cdec8f714ca7b7c60e9dadf http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-support/curl?id=0b1e3746478e9ad1800b027ab5dc96495997807e http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-support/curl?id=e885875f2af9cee0e7557ee130d3180492e507dd It should be deleted after yocto version up. SPEC-4753 Signed-off-by: Qiu Tingting Change-Id: Ic4848d1aea6c4991f0a7ff8c0dcb51c07211312e --- .../recipes-support/curl/curl_7.82.0.bbappend | 39 ++++++++++++++++++++++ .../recipes-support/curl/files/disable-tests | 27 +++++++++++++++ meta-agl-test/recipes-support/curl/files/run-ptest | 6 ++++ 3 files changed, 72 insertions(+) create mode 100644 meta-agl-test/recipes-support/curl/curl_7.82.0.bbappend create mode 100644 meta-agl-test/recipes-support/curl/files/disable-tests create mode 100644 meta-agl-test/recipes-support/curl/files/run-ptest diff --git a/meta-agl-test/recipes-support/curl/curl_7.82.0.bbappend b/meta-agl-test/recipes-support/curl/curl_7.82.0.bbappend new file mode 100644 index 00000000..f4d27008 --- /dev/null +++ b/meta-agl-test/recipes-support/curl/curl_7.82.0.bbappend @@ -0,0 +1,39 @@ +# Add ptest support +# backport of yocto +# http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-support/curl?id=a0ea00daace826129cdec8f714ca7b7c60e9dadf +# http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-support/curl?id=0b1e3746478e9ad1800b027ab5dc96495997807e +# http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-support/curl?id=e885875f2af9cee0e7557ee130d3180492e507dd +# +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI += " \ + file://run-ptest \ + file://disable-tests \ +" + +inherit ptest + +do_compile_ptest() { + oe_runmake test + oe_runmake -C ${B}/tests/server +} + +do_install_ptest() { + cat ${WORKDIR}/disable-tests >> ${S}/tests/data/DISABLED + rm -f ${B}/tests/configurehelp.pm + cp -rf ${B}/tests ${D}${PTEST_PATH} + cp -rf ${S}/tests ${D}${PTEST_PATH} + find ${D}${PTEST_PATH}/ -type f -name Makefile.am -o -name Makefile.in -o -name Makefile -delete + install -d ${D}${PTEST_PATH}/src + ln -sf ${bindir}/curl ${D}${PTEST_PATH}/src/curl + cp -rf ${D}${bindir}/curl-config ${D}${PTEST_PATH} +} + +RDEPENDS:${PN}-ptest += "bash \ + perl-modules \ + perl-module-time-hires \ + perl-module-digest-md5 \ + perl-module-digest \ + perl-module-ipc-open2" + + diff --git a/meta-agl-test/recipes-support/curl/files/disable-tests b/meta-agl-test/recipes-support/curl/files/disable-tests new file mode 100644 index 00000000..41167756 --- /dev/null +++ b/meta-agl-test/recipes-support/curl/files/disable-tests @@ -0,0 +1,27 @@ +# These CRL test (alt-avc) are failing +356 +2100 +# These CRL tests are scanning docs +971 +1119 +1132 +1135 +# These CRL tests are scnning headers +1167 +# These CRL tests are scanning man pages +1139 +1140 +1173 +1177 +# This CRL test is looking for m4 files +1165 +# This CRL test is looking for src files +1185 +# These CRL tests need --libcurl option to be enabled +1400 +1401 +1402 +1403 +1404 +1405 +1465 diff --git a/meta-agl-test/recipes-support/curl/files/run-ptest b/meta-agl-test/recipes-support/curl/files/run-ptest new file mode 100644 index 00000000..614e8229 --- /dev/null +++ b/meta-agl-test/recipes-support/curl/files/run-ptest @@ -0,0 +1,6 @@ +#!/bin/sh +cd tests +./runtests.pl -a -n -s | sed \ + -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \ + -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \ + -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//' -- 2.16.6