From patchwork Fri Oct 19 19:43:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 149352 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3711565lji; Fri, 19 Oct 2018 12:43:29 -0700 (PDT) X-Google-Smtp-Source: ACcGV6207BjrjJDuHMif0Bwc0rhvkBFWM9nC8hknh26XTkCu8XW6OI3VmMILj82YVgIaw6JVEX0L X-Received: by 2002:a63:c044:: with SMTP id z4-v6mr33358600pgi.274.1539978209515; Fri, 19 Oct 2018 12:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539978209; cv=none; d=google.com; s=arc-20160816; b=Rhie3A/2Q1pYqSqs83R2eL2K6NkjGxAq1eGiLHrgHvRsaagTcfVIbmhijFgIoXC6e5 8OJlYPHqUeKDIjYktdTgeQQyIKNWHoFnL5DkCtNbJDhvBrAEoskvYXBZWRKROZx/45/V TyWqXpKUmC1VwTfYpSO9eg7v4HNPI843z52JS5EnoA2s1ReD+Sd+YwUGhie3QmGNPmD5 RPl2G3AtPKJGr8aLpSdADhj/dqowfhDsrHR4D2C32AqrYfmNqhouHu02n2WJAkhryxUm qAu/4+jup/bFZTmupvV9mzJTNN2ifJ0YK1VKCIFYlO/8qefdkkpqJVptfGABn67xlzqf ADoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=CVhqiyp+X6nFsIru5yYhwlci6Lq7w6JQWvwWYYjvrUI=; b=yWcbyL1uWKWCHirBMod/u9tlMM/XxLKWsV4KKtlckBZiW7fIzafiCDfHlWdctb5loR nx/txALu6yq0Ekmno+7P+GRXkyz++5jWgNOgy7ClVEE6qMzpt4sFXCpSRaek4b7I6uwM biqXonDXOizlUSAVX0eT35zgw5IVeL7rZFslWq9PuOoyxCwwcCwlyRNBgMTGhqUie1m3 TX9WLqJQvBqnhM3IxvaTUtOYNUeYsZpBSQt9VLRvbf9tYEENO3oYhVfZxvXR314ucRSb l9NeJjgdS1tuQYnEQMW3pT7ML1JRLGIpLFiEFC9QbbeqcMi9ZjGwYkPQqRK1rc527xMN BRjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=tuwnZVK+; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a1-v6si25387841pga.240.2018.10.19.12.43.28; Fri, 19 Oct 2018 12:43:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=tuwnZVK+; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AE79D79CFF; Fri, 19 Oct 2018 19:43:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mail.openembedded.org (Postfix) with ESMTP id B338274C4D for ; Fri, 19 Oct 2018 19:43:21 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id y11-v6so4687217wma.3 for ; Fri, 19 Oct 2018 12:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=UzkvKBpLJnDqBsLM0gAHY0ud+qWrd8rCqJ6QaXEq66g=; b=tuwnZVK+lyQn2vGJq9/UIOqWVvy8RdyRwgWNgHH9192OmY0G1dlQioWll4l4GbbFNl b3oszYtuZ1x1gIPPKRnSvR4A8Pnn7SuUF+jKdsSaDfVgQI2WFJKyNEiVoOTuyzJ+BUhs jkSWnwH3Dqh9d15oAIjn+N0HOW4rwuO38AoHkGLL0wuHQ7dE/MVP8elpWhnjVZe/M+z/ HQ86r2aGa2lQnihbfz8YB3CR0lduP4cETY2abmS0915Whin/8D9rk5ZUUUSMn8j60Gvo 6qzi+RW/KmOjV6+fYUMBWHUC7K1QMDjTxEDdbpByVTETCY3yYhqCTuDpMpDQldFEDpFJ PCzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=UzkvKBpLJnDqBsLM0gAHY0ud+qWrd8rCqJ6QaXEq66g=; b=j46oCfwrv2FoGJI+cC800rxk1zS+CRqUAwhrn//THmUcq2ZnbWWPom6uHnWqEl8VgT tj9Gw2GbinEc30dAZQS3RgicDPHSHsVtxRXj0YIFLlnQmjKZqPYrNrGYl+ynHAJwBP+L Kc96vjsrTx5r5f1ILJu7fNP8Dk9/e1FmeczS+wRlOIFmC1la2wl46JiVGfbuucLliMO2 xKQYxUiHmTYClSosG3cPTHpeoBzmrHperCFHvdlHID9FWdmt8goIhmUP7Mi83o6qvHF/ JXAS4cw8uQg+vvZJU4BFdNuiZRys9PBCHlPZS5kfjUMBeBjQ4m3VT+ZX2IlQfYM3+u+F nUwA== X-Gm-Message-State: ABuFfohqlhpSgYdLs5YAT4G1jBbRnSM1WNj73iQZut5rtNjs3rXZxUEn GkFjwEIBF8KE5pknfwyBLsnpw8csKn4= X-Received: by 2002:a1c:7c07:: with SMTP id x7-v6mr6136079wmc.32.1539978201852; Fri, 19 Oct 2018 12:43:21 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id 134-v6sm2830398wmb.13.2018.10.19.12.43.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Oct 2018 12:43:21 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 19 Oct 2018 20:43:17 +0100 Message-Id: <20181019194318.23511-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/2] openssl: fix ptest X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Previously the ptest installation was simply a copy of the entire build tree, which is terribly ugly. Instead copy just the pieces we need, symlink to /usr as appropriate, and add missing dependencies. Remove PRIVATE_LIBS as we don't ship copies of the libraries now. Also remember to do 'set -x' in run-ptest, so if the tests fail the runner knows! [ YOCTO #12965 ] [ YOCTO #12967 ] Signed-off-by: Ross Burton --- meta/recipes-connectivity/openssl/openssl/run-ptest | 14 +++++++++++--- meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-connectivity/openssl/openssl/run-ptest b/meta/recipes-connectivity/openssl/openssl/run-ptest index 65c6cc7b862..0a620dea74a 100644 --- a/meta/recipes-connectivity/openssl/openssl/run-ptest +++ b/meta/recipes-connectivity/openssl/openssl/run-ptest @@ -1,4 +1,12 @@ #!/bin/sh -cd test -OPENSSL_ENGINES=../engines BLDTOP=.. SRCTOP=.. perl run_tests.pl -cd .. + +set -e + +# Optional arguments are 'list' to lists all tests, or the test name (base name +# ie test_evp, not 03_test_evp.t). + +export TOP=. +# OPENSSL_ENGINES is relative from the test binaries +export OPENSSL_ENGINES=../engines + +perl ./test/run_tests.pl $* diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb index 0d80aba64d7..4516f610217 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb @@ -151,10 +151,22 @@ do_install_append_class-nativesdk () { } do_install_ptest () { - cp -r * ${D}${PTEST_PATH} -} + cp ${B}/Configure ${B}/configdata.pm ${D}${PTEST_PATH} + # TODO fuzz needs to be pruned of non-binaries + cp -r ${B}/external ${B}/test ${B}/fuzz ${B}/util ${D}${PTEST_PATH} + + # For test_shlibload + ln -s ${libdir}/libcrypto.so.1.1 ${D}${PTEST_PATH}/libcrypto.so + ln -s ${libdir}/libssl.so.1.1 ${D}${PTEST_PATH}/libssl.so -PRIVATE_LIBS_${PN}-ptest = "libcrypto.so.1.1 libssl.so.1.1" + install -d ${D}${PTEST_PATH}/apps + ln -s ${bindir}/openssl ${D}${PTEST_PATH}/apps + install -m644 ${B}/apps/*.pem ${B}/apps/*.srl ${B}/apps/openssl.cnf ${D}${PTEST_PATH}/apps + install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps + + install -d ${D}${PTEST_PATH}/engines + install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines +} # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto # package RRECOMMENDS on this package. This will enable the configuration @@ -176,7 +188,7 @@ CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" RDEPENDS_${PN}-bin = "perl" RDEPENDS_${PN}-misc = "perl" -RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" +RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash python" RPROVIDES_openssl-conf = "openssl10-conf" RREPLACES_openssl-conf = "openssl10-conf"