From patchwork Mon Jun 20 06:42:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yogesh Tyagi X-Patchwork-Id: 9378 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9EB6C43334 for ; Mon, 20 Jun 2022 06:42:15 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.27017.1655707332810708406 for ; Sun, 19 Jun 2022 23:42:13 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=VUzVGuHG; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: yogesh.tyagi@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655707332; x=1687243332; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=GhSxwPHK5lAtEc/16EaNe3PftQ1+Oa/mGsC5fYceTgg=; b=VUzVGuHGrysUnrWx6OPHTiBfpqraPQ8VyGmHSwhr3r7S0kV4jOXFNABj Sw60vh0rshdl1LyZvhdmTfxnVw8pJPqtNBtUx5oHCVaXJ/SmTU5WZSeh7 YZwLsv1Lu4JtGNwLkusMN7UNfoFU1Acxy5KSNe0JPH+al3Ypqw2PxnVTY t51zl/60sll6xNcWhzsKkDmiP/APTVE4TRCcQfVT4c5tMa8uKcsZ1LZTr nmRthZfTETKyUKFAirj9LWor3bWpNFdVyPFwmoVOcc6zqEftGq67CKRFH VCorBh2p11q3LLYS5tQME71D/PmJ0HPD+xXmqIjjGRn4edPrGzfxRgFL1 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10380"; a="278589764" X-IronPort-AV: E=Sophos;i="5.92,306,1650956400"; d="scan'208";a="278589764" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2022 23:42:12 -0700 X-IronPort-AV: E=Sophos;i="5.92,306,1650956400"; d="scan'208";a="614274112" Received: from andromeda02.png.intel.com ([10.221.253.198]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 19 Jun 2022 23:42:09 -0700 From: Yogesh Tyagi To: openembedded-core@lists.openembedded.org Subject: [PATCH] Add ptest to curl Date: Mon, 20 Jun 2022 14:42:00 +0800 Message-Id: <20220620064200.66981-1-yogesh.tyagi@intel.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 20 Jun 2022 06:42:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167084 - curl-ptest is taking around 270 seconds to execute so added curl-ptest to PTESTS_SLOW - This patch is rework on an existing patch provided by Maxin B. John (maxin.john@intel.com) https://www.openembedded.org/pipermail/openembedded-core/2017-July/139176.html - Below is the run log of curl-ptest START: ptest-runner 2022-06-20T03:28 BEGIN: /usr/lib/curl/ptest ********* System characteristics ******** * curl 7.83.1 (x86_64-poky-linux-gnu) * libcurl/7.83.1 OpenSSL/3.0.3 zlib/1.2.12 libidn2/2.3.2 * Features: alt-svc AsynchDNS Debug HSTS HTTPS-proxy IDN Largefile libz NTLM SSL TLS-SRP UnixSockets * Disabled: headers-api * Host: qemux86-64 * System: Linux qemux86-64 5.15.44-yocto-standard #1 SMP PREEMPT Tue May 31 20:28:59 UTC 2022 x86_64 GNU/Linux * OS: linux * Servers: HTTP-unix * Env: * Seed: 238592 ***************************************** PASS: test 0001 (1 out of 1487, remaining: 25:45, took 1.040s, duration: 00:01) PASS: test 0002 (2 out of 1487, remaining: 13:50, took 0.078s, duration: 00:01) ... ... PASS: test 3015 (1477 out of 1487, remaining: 00:01, took 0.024s, duration: 03:20) PASS: test 3016 (1478 out of 1487, remaining: 00:01, took 0.023s, duration: 03:21) PASS: test 3019 (1481 out of 1487, remaining: 00:00, took 0.015s, duration: 03:21) PASS: test 3020 (1482 out of 1487, remaining: 00:00, took 0.014s, duration: 03:21) test 3025...The tool set in the test case for this: 'lib3025' does not exist TESTDONE: 1280 tests were considered during 201 seconds. TESTDONE: 784 tests out of PASS: 804 report: 97% TESTFAIL: These test cases failed: 356 412 413 971 1119 1132 1135 1139 1140 1165 1167 1173 1185 1400 1401 1402 1403 1404 1405 1465 DURATION: 207 END: /usr/lib/curl/ptest 2022-06-20T03:31 STOP: ptest-runner TOTAL: 1 FAIL: 0 - The failed testcase are either trying to parse man page/dcoumentation pages or require --libcurl option to be enabled in curl configuration [YOCTO #6707] Signed-off-by: Yogesh Tyagi --- .../distro/include/ptest-packagelists.inc | 1 + meta/recipes-support/curl/curl/run-ptest | 6 +++++ meta/recipes-support/curl/curl_7.83.1.bb | 22 +++++++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/curl/curl/run-ptest 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 = "\ babeltrace2-ptest \ busybox-ptest \ coreutils-ptest \ + curl-ptest \ dbus-ptest \ e2fsprogs-ptest \ findutils-ptest \ 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 @@ +#!/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//' diff --git a/meta/recipes-support/curl/curl_7.83.1.bb b/meta/recipes-support/curl/curl_7.83.1.bb index 1d9de29a65..34c2298fe1 100644 --- a/meta/recipes-support/curl/curl_7.83.1.bb +++ b/meta/recipes-support/curl/curl_7.83.1.bb @@ -9,13 +9,16 @@ SECTION = "console/network" LICENSE = "MIT-open-group" LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" -SRC_URI = "https://curl.se/download/${BP}.tar.xz" +SRC_URI = "https://curl.se/download/${BP}.tar.xz \ + file://run-ptest \ +" + SRC_URI[sha256sum] = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" -inherit autotools pkgconfig binconfig multilib_header +inherit autotools pkgconfig binconfig multilib_header ptest # Entropy source for random PACKAGECONFIG option RANDOM ?= "/dev/urandom" @@ -80,6 +83,21 @@ do_install:append:class-target() { ${D}${bindir}/curl-config } +do_compile_ptest() { + oe_runmake test + oe_runmake -C ${B}/tests/server +} + +do_install_ptest() { + cp -rf ${B}/tests ${D}${PTEST_PATH} + cp -rf ${S}/tests ${D}${PTEST_PATH} + 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" + PACKAGES =+ "lib${BPN}" FILES:lib${BPN} = "${libdir}/lib*.so.*"