From patchwork Mon Dec 10 17:11:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 153311 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3793244ljp; Mon, 10 Dec 2018 09:11:57 -0800 (PST) X-Google-Smtp-Source: AFSGD/XlO8/CJ4q0fo6oZjxasEpiTwC1LO7Ttb3RDgs8O3XprBDsa1gMM7KAe7FLGQqUpjzp26Th X-Received: by 2002:a62:1447:: with SMTP id 68mr12892930pfu.257.1544461917015; Mon, 10 Dec 2018 09:11:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544461917; cv=none; d=google.com; s=arc-20160816; b=h71WbuCF5H4nSM355q3Hb1E5RDFatyflKlNzCQm0SABBkPbYoOmypl4A6Ye5SVHnaG E0OAvqUcEJ1yn5+pYINt75u8fAxvGshJYNXd48UvzwS9pRG4sPlUBYf7wXbVPDldeFMJ S/bQbdeWmuQW9bFL6kQ4r4bWycd4K3yqe8lmrvlVeD0FwR9lbqwmFnshesQn6Sqy6dQn Mk+7Ted/FSrK0agOf9BVY0AWLY4/csrIDWxsLB7EBaiADI4f3p1cnBCuM9uV+T4/KlJD 3xCsOQoJy/vDf4RZLrFLKTrXXqgNjfzyDUwwxblwo0E/F8iSHCpQGeM+5jqV8nV76+Rq vZNw== 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=X6Ij6VtYzm9gZVRJ+QsZQ1x+DW58ZB/4m56LTVAPHfM=; b=Sb6P/3RRaDOvEJ8OJHZaVv/ba/mrJm6Jcui0cCmuAjvAjr4BBewQKUJhsq7Dh/IIkO gZwqeyP3YSzdsFvHuXhWMfpr07+o2t4VJtTEQEa2zjhr72skevdBw22nHXI44z7T3wYr lQ9n5JoYOD8o2i4w8IAMtvBH1xk3d5KUic+/ItQKRU29b0K7qzWNa4sIiGHlaMbaehzz 20lWUFLLRnINRZf2x/NZxLs19dBODHURkVf10dpQX4t7nXJRw4CW+yIoisiAzSj0DeB/ dokY3CP1SBTh4oGRcNwsp0vZBvVsjVaJMKvK4Y/g8sJhdDdCxxnEpkxRgWAkucbpBf3y taOg== 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=JeQgmhCX; 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 y1si10225089plt.356.2018.12.10.09.11.56; Mon, 10 Dec 2018 09:11:57 -0800 (PST) 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=JeQgmhCX; 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 235F26C4C0; Mon, 10 Dec 2018 17:11:53 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mail.openembedded.org (Postfix) with ESMTP id E765B6C4BC for ; Mon, 10 Dec 2018 17:11:51 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id j10so11280562wru.4 for ; Mon, 10 Dec 2018 09:11:53 -0800 (PST) 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=mvGNap8dnI1JLDffeDhu79eFrts++B+nvimGhQTtvHY=; b=JeQgmhCXZ8vXtW1R+QdfI46wi1Er0GCXX4QwhbOZoQtTX/hAbXWCmPuQLC4PIkYY/f sL50hB3bTeU3xtZ6dNTaW1cUR+HfS8kfYvGMZCvgAuiWHuqOhGTlydVL6ZMy2uN0zCgW JuyQIPe2r/0iDcFuRp4uLNsFnm+HOsUjCVcYpH8mQPab7qNXK2YuvBw/DyYyPSsMj4bx hRb9w5tIemWWPmMV71LpULeo+qew9iQxZalM4kbNNnCOsVB4EsvIP0Q/ORKil0UBtg1W Yy4ATy7EUkvxXwc+ZHyOY0MBxBtJ26sDWX9wO1dvePO/nA4FFBuxC/lUhw7U/gE1b2UR 0jQQ== 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=mvGNap8dnI1JLDffeDhu79eFrts++B+nvimGhQTtvHY=; b=gKB38YduGcoV3LAWQH+tqlKns7GW83uYbnhY7iwUiL2JYtivhpnL3r8X4J+Mmg9f/t +ddZkcLCXPtZoyD8k3BGEP3m1nPfLJ02CVW+oUW9HRS76V5KfQJ40/zqeGeJRgRDlTMn fsS7RH626oCV4Xkamylnwx8EfvOKM2C7SWqgKNUSTSUlN45PVl4QWyaGrHNJI7NvSJpM yFHDd9aBapzZrXnQDuNNtpBRJZw6NBfqhyu7+syzyhYPIJJxdi8tdkSTN3bNiaXe2kKD d7Ekp43cW+ar/vawv15W3NHnwNSFxVdx7Qz+/TbRsmDOeVOSn/YPIJOjVJwf40HtYaag r/mg== X-Gm-Message-State: AA+aEWadPl4HTkWTZJNU5s14t1s42Eh8dQZfGfAQxuDJ4UFTITNdtstn qbZbYsLbNzWKbw1nuPizc1kr4JWr1d8= X-Received: by 2002:adf:c612:: with SMTP id n18mr10115860wrg.174.1544461912084; Mon, 10 Dec 2018 09:11:52 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id y13sm12343505wrn.73.2018.12.10.09.11.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 09:11:51 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Dec 2018 17:11:38 +0000 Message-Id: <20181210171141.10722-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/4] nss: fix Upstream-Status format 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 Signed-off-by: Ross Burton --- meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch index 7ba8d16483a..bb1c6e3b345 100644 --- a/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch +++ b/meta/recipes-support/nss/nss/nss-fix-SHA_HTONL-bug-for-arm-32be.patch @@ -2,7 +2,7 @@ Subject: [PATCH] Fix SHA_HTONL bug for arm 32be. In arm 32be, there is no need to reverse the host value. -Upstream Status: Pending +Upstream-Status: Pending Signed-off-by: Zheng Ruoqin --- From patchwork Mon Dec 10 17:11:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 153312 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3793396ljp; Mon, 10 Dec 2018 09:12:06 -0800 (PST) X-Google-Smtp-Source: AFSGD/VMUTRmx94KOntzu6CJkMwtcvYDRTIKClxNWGMwXrRwNR8fYiDy3bOd8nDSLHaluc6doYwI X-Received: by 2002:a17:902:ba8b:: with SMTP id k11mr12675759pls.177.1544461926502; Mon, 10 Dec 2018 09:12:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544461926; cv=none; d=google.com; s=arc-20160816; b=E6G330nblcEF3qub5LTL1Bs12zuJCgRP0hgCyYn9YdsCqiw1AbYidi1jb7OItaMs/m bVTgX9b3RqsY/NZbEIF1othn9//bvGJN3I5rzZgujNvuF23gQKBFPu8nJVnhCLtg4uea WFMIsHG+OWe74cypodqm7Oheb2j9/shSXR16vpLBFseGGEzsHh7W22hxSrXRriviyb3n 3HAyzEwI2MEewuo2dZ4lpq+mzI0iGWlueVCIEKEVGmfipCEjpK6QMcL3zC+1oq2/udzV HVnPcp82L2MG3CyoZfjx+ek62DV36L95Ju2S+G1nEGG/GPq6OEvpMRJ7DpVCo2C4/xzt Pc8Q== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=InY5+4bwJCdhVcgsEAZZNQh3EMtNwye9hE+wh42CfzE=; b=FlzbsMrqwMNJsgLnkB6gsPEHrCKy/Ezu3VCZFWdpdnVuOqGO6sM8VPvCQs0hmnxKrY nrYrZDzpiSSWTID6I4QXHbwLcAP/QyuDI+DJ6OD0GBqgd2U5BrLK4A/8z8FW3xVTUmZy cuVybVp6k1rvBiVMp+uIcxo5Mhn1w4da5Un6yc2hFGu1y0b3zXxpfXcmKSjPIhAOFXM3 YbTRlxhZ+fMPbBmVLlbWTGzoPjXwy16HrX4FI26WN30EeEsYnpsQNZQAdd3Mh8uxBF3k eFKQu5chwRl+JMe4ZZ8J5DOgFShonjS1s+3qOovUtlDbPSmDdbQNyS0AVhBFijixTID8 Q6lQ== 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=RlqxFX25; 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 bj2si9951393plb.27.2018.12.10.09.12.06; Mon, 10 Dec 2018 09:12:06 -0800 (PST) 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=RlqxFX25; 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 CBD2A6C4E0; Mon, 10 Dec 2018 17:12:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mail.openembedded.org (Postfix) with ESMTP id 92F2B6C4BC for ; Mon, 10 Dec 2018 17:11:52 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id b14so11262997wru.12 for ; Mon, 10 Dec 2018 09:11:54 -0800 (PST) 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:in-reply-to:references; bh=Uk0hzf4sFMOXl6ZviEkCfUe30w8Nz2BlsIjxfEbkUys=; b=RlqxFX25Ftm9q3zRxF5B6yzaB0dytjyfN5H0r5TQ2gAH33sFzTJl6bF/AQ8v3yKW7v ik8fz50vusPCdVAXsSxzKYBTBCuVdk7Jepk2iD1Z69m41o7WQlxiVQYTa9BwZEEnpSCb 6ttT3aEMydj7NXcxbNo+OJU1GZLEnBRYPz+nynuOh2P2qQ4C2kWsAfPW9MHhDzMcADH+ ZVwn8AvPWO/t5+iLbNk3WVWknXbnlJCq8K+y9zOe97NYzqo6bWuA+ZLtQMB5I/mzNPI9 DZtKNFqCBzlpmLqTYEUZMpf5+q/++Va2LkvQzrGGB607JSHOGSW6nJP0B1/NsD+MiCcx t2Gw== 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:in-reply-to :references; bh=Uk0hzf4sFMOXl6ZviEkCfUe30w8Nz2BlsIjxfEbkUys=; b=bkWPheDQXUscL60s6gZo0I4wf8zoJkAVhBo5S8ZKR5GpP0S3cMAPHR20O3IC/cjIQK C80uog894aP4cm1At8LFHbKttSQrKbKeKk7/wqhc8wATJUExNom8/mu7KbeK/Hvw0Led /q/bbRsY59Kvjrk3hba4W6H3XHhPOna82UalO7O0E9fC0q6HxrvUsA84PtZWwvthq8am UaugSPcM6clVmygRLggXq1aLKLM4+PsQsy68HFeGxyk0ov2DlXDfbcHRumMCr5tMzY7m K9xiXAGUZpD5T8yJ16JQnqeLjX7C+WrOhywboRPd5tGhSpIRbUioKU5FWAhqWcxhPGLE jfLQ== X-Gm-Message-State: AA+aEWaUoySjdBxMyw1L24TgJ3JDQ1z6rJL+qUAdVjjM7nHDa1E5cJl6 qdYsoW+sGOTA31VQ19i4/0Kn7vb7fIs= X-Received: by 2002:adf:f5d1:: with SMTP id k17mr11495294wrp.59.1544461913086; Mon, 10 Dec 2018 09:11:53 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id y13sm12343505wrn.73.2018.12.10.09.11.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 09:11:52 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Dec 2018 17:11:39 +0000 Message-Id: <20181210171141.10722-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181210171141.10722-1-ross.burton@intel.com> References: <20181210171141.10722-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] oeqa/sdk: show output if run() fails 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 Use oeqa.utils.subprocesstweak to monkey-patch the subprocess exception so that any output is shown, and remove any explicit try/catch handling that would have hidden this. Signed-off-by: Ross Burton --- meta/lib/oeqa/sdk/cases/buildcpio.py | 3 +++ meta/lib/oeqa/sdk/cases/buildlzip.py | 2 ++ meta/lib/oeqa/sdk/cases/gcc.py | 3 +++ meta/lib/oeqa/sdk/cases/perl.py | 12 ++++++------ meta/lib/oeqa/sdk/cases/python.py | 21 +++++++++------------ meta/lib/oeqa/sdkext/cases/devtool.py | 3 +++ 6 files changed, 26 insertions(+), 18 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/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py index f348ac5d909..6697b12de29 100644 --- a/meta/lib/oeqa/sdk/cases/buildcpio.py +++ b/meta/lib/oeqa/sdk/cases/buildcpio.py @@ -2,6 +2,9 @@ import unittest from oeqa.sdk.case import OESDKTestCase from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class BuildCpioTest(OESDKTestCase): td_vars = ['DATETIME'] diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py index 9d137f30ebf..b57fbbece7f 100644 --- a/meta/lib/oeqa/sdk/cases/buildlzip.py +++ b/meta/lib/oeqa/sdk/cases/buildlzip.py @@ -2,6 +2,8 @@ import unittest from oeqa.sdk.case import OESDKTestCase from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() class BuildLzipTest(OESDKTestCase): td_vars = ['DATETIME'] diff --git a/meta/lib/oeqa/sdk/cases/gcc.py b/meta/lib/oeqa/sdk/cases/gcc.py index b32b01fc241..54c6fc488bc 100644 --- a/meta/lib/oeqa/sdk/cases/gcc.py +++ b/meta/lib/oeqa/sdk/cases/gcc.py @@ -5,6 +5,9 @@ import unittest from oeqa.core.utils.path import remove_safe from oeqa.sdk.case import OESDKTestCase +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class GccCompileTest(OESDKTestCase): td_vars = ['MACHINE'] diff --git a/meta/lib/oeqa/sdk/cases/perl.py b/meta/lib/oeqa/sdk/cases/perl.py index e1d2bc159a0..b8adc5ac72d 100644 --- a/meta/lib/oeqa/sdk/cases/perl.py +++ b/meta/lib/oeqa/sdk/cases/perl.py @@ -1,6 +1,9 @@ import unittest from oeqa.sdk.case import OESDKTestCase +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class PerlTest(OESDKTestCase): def setUp(self): if not (self.tc.hasHostPackage("nativesdk-perl") or @@ -8,9 +11,6 @@ class PerlTest(OESDKTestCase): raise unittest.SkipTest("No perl package in the SDK") def test_perl(self): - try: - cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'" - output = self._run(cmd) - self.assertEqual(output, "Hello, world") - except subprocess.CalledProcessError as e: - self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) + cmd = "perl -e '$_=\"Uryyb, jbeyq\"; tr/a-zA-Z/n-za-mN-ZA-M/;print'" + output = self._run(cmd) + self.assertEqual(output, "Hello, world") diff --git a/meta/lib/oeqa/sdk/cases/python.py b/meta/lib/oeqa/sdk/cases/python.py index 2254867d455..b9174fadbaa 100644 --- a/meta/lib/oeqa/sdk/cases/python.py +++ b/meta/lib/oeqa/sdk/cases/python.py @@ -1,6 +1,9 @@ import subprocess, unittest from oeqa.sdk.case import OESDKTestCase +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class Python2Test(OESDKTestCase): def setUp(self): if not (self.tc.hasHostPackage("nativesdk-python-core") or @@ -8,12 +11,9 @@ class Python2Test(OESDKTestCase): raise unittest.SkipTest("No python package in the SDK") def test_python2(self): - try: - cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" - output = self._run(cmd) - self.assertEqual(output, "Hello, world\n") - except subprocess.CalledProcessError as e: - self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) + cmd = "python -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" + output = self._run(cmd) + self.assertEqual(output, "Hello, world\n") class Python3Test(OESDKTestCase): def setUp(self): @@ -22,9 +22,6 @@ class Python3Test(OESDKTestCase): raise unittest.SkipTest("No python3 package in the SDK") def test_python3(self): - try: - cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" - output = self._run(cmd) - self.assertEqual(output, "Hello, world\n") - except subprocess.CalledProcessError as e: - self.fail("Unexpected exit %d (output %s)" % (e.returncode, e.output)) + cmd = "python3 -c \"import codecs; print(codecs.encode('Uryyb, jbeyq', 'rot13'))\"" + output = self._run(cmd) + self.assertEqual(output, "Hello, world\n") diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index 0860e8d17cf..d322f86c73e 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -9,6 +9,9 @@ from oeqa.sdkext.case import OESDKExtTestCase from oeqa.core.decorator.oeid import OETestID from oeqa.utils.httpserver import HTTPService +from oeqa.utils.subprocesstweak import errors_have_output +errors_have_output() + class DevtoolTest(OESDKExtTestCase): @classmethod def setUpClass(cls): From patchwork Mon Dec 10 17:11:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 153313 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3793517ljp; Mon, 10 Dec 2018 09:12:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/WkboesZ6JUMqLdxAsYdytpHHaqNf7dUnGyDv9ccT4nF/zFUgToCsiNWsxeBZAki5DwBsig X-Received: by 2002:a17:902:8484:: with SMTP id c4mr12480839plo.59.1544461932960; Mon, 10 Dec 2018 09:12:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544461932; cv=none; d=google.com; s=arc-20160816; b=FVZqLTK9R5dhvMKHElhQDhe85YmKh3DDshAdStma1DOEKZeht3vYflnGIyMXm/cbZu ijucPcOLhdpY5IBvyQl/e3uQd1CFmoilzGR1o1/yGdlLL8spoAT6epDQABiv9scCXyHp gysHCqcTUbsDAdYkGdkXMJHU5qyIaLatZ4Uwo10NAyYXJcY7FO+kMuQVKK5Nx+G8ht/P QTME8cvFvHM4PDRo8MsoCwZ+OxplDypIG12etGVZQtYP6AHWpMt8loildcn5eUfRuefQ dOMwORg8Q4fZO79dhqZibczGQjNM8KeKK7tZ/f9XHpwESWrXM+lYAWHcBPewY8CFnW5y BqIA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=AKgQm11f+3ThMmVoQ/GN7ZqiHWi7rxTkTGkYA0AASBk=; b=Aj91nNsbqY0e9Xfgb1i2pixFL4NX0FV7L9Mjeo8Q6nIzbj3gwXzzVgzclCx90LySNb D4qLL7bvlOvvEe8xsAxaS8am3+zC/1/VWYxkCy4LczxPTLDr3oOqCXh4meL6qNZZ2CB/ 6jrqI6bZ7Fm2+UW8lzBUqtfo76RiSe3B/pseLimSLbbMtoLFtl/mu0GYXy1t3AAAX9rV xsgUpkP+U74kIGVkm/PhmgrgBYvi1ncI2mtVquPZaZhqLZgK6rAkFjIWbHKtyV5OA3jw OZ4I1ZEWGLnmR/kJMSaKlTojkwvxEqRZDtaIsryCuTPRLUhdT0X7TyRPo/iQbAwcEfm3 eYdg== 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=EzHP7arp; 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 r10si10126575pgg.143.2018.12.10.09.12.12; Mon, 10 Dec 2018 09:12:12 -0800 (PST) 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=EzHP7arp; 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 191B76C4E9; Mon, 10 Dec 2018 17:12:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id C99716C4DC for ; Mon, 10 Dec 2018 17:11:53 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id c14so11327244wrr.0 for ; Mon, 10 Dec 2018 09:11:54 -0800 (PST) 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:in-reply-to:references; bh=qkOtSir03PTwCW1cU1ditSbT9t5iVVadJ/LSQ2rj1V4=; b=EzHP7arp4HOLONVCMz7CPLT6Otd02jSv3VhwBc3gq2GF89RBLUlpTOnaIBB6XRYtEh dOYq45xMcWpjifSEjtDmgSDvhc+FNvt++OImZtKzpIE046kAWr/XZ/4M6mNKXyrJXxkx Mptt1s42wSROCd2IM8khdEC69YXSVG/JjacT6gDkPAOTPDXDrL/QxdnHRLQ+Cjg84AZq 63/WBHGmAKCyykDdd5PCf2UOnsw6xeHMK/rksgA07E4WkTSBbIL2x1skIEr3ObskoEQ6 L2TuyFAgWUXWfoRdw/l9wtXY91Fso8KUyXrE2gT01cHeNfD8Wlov75Ti7xUCEZBIUD3P 2e4A== 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:in-reply-to :references; bh=qkOtSir03PTwCW1cU1ditSbT9t5iVVadJ/LSQ2rj1V4=; b=b8PbBDq415wBhR2M+JTFz+0gcRSg74Gd62Dor2WskfjrMQAQ6iKoSIMkuf3tD1+tQL zdj32y4EljfCdgNqXol05XIOZNEpRDOriegpx0tTtznaWqF0kB47qbkXSH61TbZ19Bdh mOZJtsIuyKPNZjg0it+hKX+m57nU1/dAtIlRysw81syCs8E18HKY7bUu8ul0yFkPkOA3 iBU77XEMqYHgMV2kp3FLzjAD+mdh1QBA+Z/pmI7HT/WnOlIEiPUNoS3ILE2SN0ONem9E D8VTCieVljJ0K6axN3iWFpSq6B/HooT6q0555X92kT9G6lJULNZKkqnsiJ8LPPtvJFGc a4Fg== X-Gm-Message-State: AA+aEWY3p+bZovrm1kTVR9p6DMt58enjlCMmjyQTPlY53JPPsrNUb/G7 hfNCoqYr6ipz+i7doseLNczaq+hQEg8= X-Received: by 2002:a5d:528e:: with SMTP id c14mr10366026wrv.236.1544461914086; Mon, 10 Dec 2018 09:11:54 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id y13sm12343505wrn.73.2018.12.10.09.11.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 09:11:53 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Dec 2018 17:11:40 +0000 Message-Id: <20181210171141.10722-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181210171141.10722-1-ross.burton@intel.com> References: <20181210171141.10722-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/4] oeqa/sdk: clean up galculator test 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 Drop redundant imports and variables, and use os.makedirs() instead of bb.utils.mkdirhier(). Signed-off-by: Ross Burton --- meta/lib/oeqa/sdk/cases/buildgalculator.py | 8 +------- 1 file changed, 1 insertion(+), 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/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py index 7beb55884d3..c488a1c73e2 100644 --- a/meta/lib/oeqa/sdk/cases/buildgalculator.py +++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py @@ -3,17 +3,11 @@ import subprocess import tempfile import unittest -import bb - from oeqa.sdk.case import OESDKTestCase -from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject - from oeqa.utils.subprocesstweak import errors_have_output errors_have_output() class GalculatorTest(OESDKTestCase): - td_vars = ['DATETIME'] - def setUp(self): if not (self.tc.hasTargetPackage("gtk+3", multilib=True) or \ self.tc.hasTargetPackage("libgtk-3.0", multilib=True)): @@ -33,8 +27,8 @@ class GalculatorTest(OESDKTestCase): subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) self.assertTrue(os.path.isdir(dirs["source"])) + os.makedirs(dirs["build"]) - bb.utils.mkdirhier(dirs["build"]) self._run("cd {source} && autoreconf -i -f -I $OECORE_TARGET_SYSROOT/usr/share/aclocal -I m4".format(**dirs)) self._run("cd {build} && {source}/configure $CONFIGURE_FLAGS".format(**dirs)) self._run("cd {build} && make -j".format(**dirs)) From patchwork Mon Dec 10 17:11:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 153314 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3793653ljp; Mon, 10 Dec 2018 09:12:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vx7SLKG8s6slLPrcQ46EXZYQ8qwn446gYIxgcYxJjUp9arzxQYMhRBF1xdbwC3OC6c9jmF X-Received: by 2002:a17:902:f44:: with SMTP id 62mr13005584ply.38.1544461940727; Mon, 10 Dec 2018 09:12:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544461940; cv=none; d=google.com; s=arc-20160816; b=mdSy/WsQS/bRNTgTd68LvhKCUbQo0vVfrWFjZOjwVAcsO8XX8u8ONYsZmmmuLCmT1T UDGyuwX2zHJ8f2+QFeScXOO0vtu7DNrnCPjue1+hJeQs4WNTAG9mcGLGWoRqYGsYfi/o RQfd+bUtGwxwb7wAQ4U4xOigoZ9RLPhs8ZItzOMHH8ioo2h9usj3m6Mz5VXbOAGa+o8E ml9rAc4ud1S1AIOHuxf5o3x8/R0epeuDQ4sry1tPZ1912z8rI2eywc2zrZy3Pkv2q/RO jY9mXdfWq3pdpPCjObkUWVqDul+FxTzuywuthCGOcSqgnIEcyDixtA0wEF6mGAqt1m5t GosQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=+LhiKfA23avFo8HuSvI/xM+8Jhfa/830OEzLB4E9Nxo=; b=Sl30ZDm3Nh3Ssxrq2+ET+yZEFTY+1/dTWb4QUwxgSGa2FDTIhMVNDIR9zRO8a1NYzY iNqCBxgEd2i1Dj2NE+G+dhfRhCQJNWFz+yCf6msa9eLqjCnZPbUsv/bCg29XMugWt4i3 Q3C8Nde942ze7AGLQHWL+ReLMTecnqMb/9vhKdYitAC1bt7uZH8BU7t8Az7zc6l8TDRo vXtgbYEQXHZXri9KgvXIptOfHWoIYEmLkyUTl7xXjziu5m5qcXEpLsWH8shbmBXjlqlR 3t383tEqeAiVR+I3+htqX7bUS6WO+aZA0acdXjw34eQhwjz529FVouUZK9tJs5ayTpO7 rscA== 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=2CjxlzMo; 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 i64si9753477pge.361.2018.12.10.09.12.20; Mon, 10 Dec 2018 09:12:20 -0800 (PST) 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=2CjxlzMo; 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 39C226C4F3; Mon, 10 Dec 2018 17:12:05 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail.openembedded.org (Postfix) with ESMTP id AD9666C4CC for ; Mon, 10 Dec 2018 17:11:54 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a62so4338495wmh.4 for ; Mon, 10 Dec 2018 09:11:55 -0800 (PST) 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:in-reply-to:references; bh=Kwlv1BFfUX1VWvbsnTC/EZAvIB3z+sXSR2Ujq3xuwAA=; b=2CjxlzMowWBaumOrlZotW0xEUcDWRpWU6UygEo22vg8ySMiv33FhUVzxXCndQ25dQH /tuT8l2M9tEtZONjMQfXEdT4M0sZtZ0Uen7kl83d0vw+MdD0ozTQFio7yE/svvYJKIlJ 9chdw62Ttsbcebtca74VYKZ3VLhfCqc+4BpIlpEbkFklhsLap0WcYHaBjYpTBITmfyUf z04cQ2SldeMEodH01Bf/GbUYXA2yM+eDUsn3hMqC9m1kfZiJfJA51XOMewjN9X4ETVnQ NuRoFPvkBy/l6oZQZQghynX6g9GtLtlHKlk9r3B0N7+vdif0zdgcgoVIbLSko/mlrWjk Eppg== 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:in-reply-to :references; bh=Kwlv1BFfUX1VWvbsnTC/EZAvIB3z+sXSR2Ujq3xuwAA=; b=K3zIIT78Q5FGgXtOUJdYi6nMUIPRkzL26xDDvYhG3RGzdVxwHZeSL60AIlsN+QSYVe oLkP95WlTDjaplNIQ5VdAqsi/YxDCS/ilrf/qB1eX+WEjTMkNGwcnv1VM/WlxICoEaOa 9omj/gYo+1Ub8bNwqZB7AhN8bNTxs4F8aYORZMJS1Huua3Hk7NMLOSWxqTeieGhch0kM dNxT7EFUWJZhaIb1aKx5izRaEWZLWfZ1oO6+hyshLs0BwuSgsM80PUGGUvYNAxIocLqI quJop07fNc5xlY/PubfLlsuRk1Bo6N66B0VW0GSenNYg9S7SSCLjkZyCSyJ7XdoGgpof +GaA== X-Gm-Message-State: AA+aEWbYnrlepQCqI/vyXDSuFda+3rKhWBqPM1lHg2Nk3adazplQjthk 8fVqCM81mEQx1lIimCcIbf9cu+kr5rw= X-Received: by 2002:a1c:e1d5:: with SMTP id y204mr11192856wmg.65.1544461914959; Mon, 10 Dec 2018 09:11:54 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id y13sm12343505wrn.73.2018.12.10.09.11.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 09:11:54 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Dec 2018 17:11:41 +0000 Message-Id: <20181210171141.10722-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181210171141.10722-1-ross.burton@intel.com> References: <20181210171141.10722-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/4] oeqa/sdk: rewrite lzip test 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 Don't use the helper class as it gets in the way more than it helps, exercise the out-of-tree paths, and verify the installed files match the expected architecture. Signed-off-by: Ross Burton --- meta/lib/oeqa/sdk/cases/buildlzip.py | 46 +++++++++++++----------------------- 1 file changed, 16 insertions(+), 30 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/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py index b57fbbece7f..d98e10fc37f 100644 --- a/meta/lib/oeqa/sdk/cases/buildlzip.py +++ b/meta/lib/oeqa/sdk/cases/buildlzip.py @@ -1,39 +1,25 @@ -import unittest +import os, tempfile, subprocess, unittest from oeqa.sdk.case import OESDKTestCase -from oeqa.sdk.utils.sdkbuildproject import SDKBuildProject - from oeqa.utils.subprocesstweak import errors_have_output errors_have_output() class BuildLzipTest(OESDKTestCase): - td_vars = ['DATETIME'] - - @classmethod - def setUpClass(self): - dl_dir = self.td.get('DL_DIR', None) - - self.project = SDKBuildProject(self.tc.sdk_dir + "/lzip/", self.tc.sdk_env, - "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz", - self.tc.sdk_dir, self.td['DATETIME'], dl_dir=dl_dir) - self.project.download_archive() - - def setUp(self): - machine = self.td.get("MACHINE") - - if not (self.tc.hasHostPackage("packagegroup-cross-canadian-%s" % machine) or - self.tc.hasHostPackage("^gcc-", regex=True)): - raise unittest.SkipTest("SDK doesn't contain a cross-canadian toolchain") - def test_lzip(self): - self.assertEqual(self.project.run_configure(), 0, - msg="Running configure failed") + with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir: + dl_dir = self.td.get('DL_DIR', None) + tarball = self.fetch(testdir, dl_dir, "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz") + + dirs = {} + dirs["source"] = os.path.join(testdir, "lzip-1.19") + dirs["build"] = os.path.join(testdir, "build") + dirs["install"] = os.path.join(testdir, "install") - self.assertEqual(self.project.run_make(), 0, - msg="Running make failed") + subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) + self.assertTrue(os.path.isdir(dirs["source"])) + os.makedirs(dirs["build"]) - self.assertEqual(self.project.run_install(), 0, - msg="Running make install failed") + self._run("cd {build} && {source}/configure --srcdir {source} $CONFIGURE_FLAGS".format(**dirs)) + self._run("cd {build} && make -j".format(**dirs)) + self._run("cd {build} && make install DESTDIR={install}".format(**dirs)) - @classmethod - def tearDownClass(self): - self.project.clean() + self.check_elf(os.path.join(dirs["install"], "usr", "local", "bin", "lzip"))