From patchwork Wed Dec 8 10:18:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 731 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 78590C4332F for ; Wed, 8 Dec 2021 10:19:07 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.42]) by mx.groups.io with SMTP id smtpd.web11.10317.1638958743676272816 for ; Wed, 08 Dec 2021 02:19:06 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=iJ3PDIg+; spf=pass (domain: weidmueller.com, ip: 40.107.0.42, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TibAnlDFtIoUXxseDlj1Q24AQ9yzHrBKOX/yxR00Y8uHRU8cXga2dP0X8mWBLvMw8XnZprxPlHEyGvx71CyOEDznHBredMnfKoaP5lbgAb9dnTbYZvzwr9iWRdSedt5TtqfW3KNGOQKw2XcGPPpqiwpbz0wJEx0/02GNg7viFuOzolXJf0vGWVJWfY+KATJ9GHWldIrpDDphq6TMqb8ZaaWCTXMGbflQQ1QxAdHdDdTZd5H+CU9k60VqPX5+F5jvC1Hn7vJOvqOcv3xzCe6HBWXmJ+9WMcXhh3ES0rddPM3A6affqd9/vU/yfA9Wtso27kSU6FZb42M3jndJe7O0bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Akgct1byB96G6UVkB4An697Y5bc25baBN2ZdrwO9OVk=; b=JGVzWKXDxvJJi7MU+W53cyqos+yb5x1uCrEIzNtDSdYmkzQ/kZCkGEmxtKlzMMRyRntQ5DZsXtL6TpB2ikN1UmRQRKPjlHmMx5kO4lW1USF1wPkEFgRtEL1KL1k5ojnHazusDookyLqHVy7Tq6FRt+W899yW0ftTEApPzgP4u/0CH4xbUKLYcg2lqdhLK+W8wM0/ZHPGt0CR1mjwW5r5CejcnhJMcSj3EC8boVn+nNF94CcH1zFPHGno2Sm3g1bm0kZGpCGofLkegdrQ7P4UseFbV2+/IvXZjE4OxzsTCt0BzERfWRzeX9vh2cIE5nwIrZS0MEL4uS3qd3o3LwM45w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Akgct1byB96G6UVkB4An697Y5bc25baBN2ZdrwO9OVk=; b=iJ3PDIg+G48kzRkEOH01uhZ/hGVzdIwuaecp/6ZLmpqLiLx0z2gSHFD0ysOJLDnZoSq06taw6iVC7jQ6+r1FsoZYcgjf4BjPKnbLWQd3oyUCZUerv7IkuzgoH5Jx0TJ9zwmUaCCSx9e3xsb4e0uwxLNa1zkmM3gQ/Xrh162yjMg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6526.eurprd08.prod.outlook.com (2603:10a6:102:df::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 10:19:00 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%8]) with mapi id 15.20.4734.024; Wed, 8 Dec 2021 10:19:00 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 1/5] recipetool: Set master branch only as fallback Date: Wed, 8 Dec 2021 11:18:35 +0100 Message-ID: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 X-ClientProxiedBy: AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.94) by AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Wed, 8 Dec 2021 10:19:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e85e7aa1-11fa-4343-f222-08d9ba34270d X-MS-TrafficTypeDiagnostic: PAXPR08MB6526:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UaKZPVKNZSKE2HN7mJdUgRmmxLCJ6nty0oR/4hZQQdkpuglfZ5vvPJbZJn5eY/eCZ7mciUQHEdEOuc2+Z2TirwyfIiIMjsA8JFVN6RB4PtG8sj6XETbxR8dx89oQ4F22N/Ab1SJQBOljrMlVhDXHblsaJbeAA4O2FUniyzzt3aEHG9qeF5W0WT4CgEx1yNMcjkkGRh98hYfZRSLfB3FmW+JSanG0Y4Izu9is0f5bK5HgdHBX66so9npaXTOnb9svud7ZhLea5BB3Jwl40ZGvEcZhEc9iKnFWZ3TAeexTRb8qZuU18ug44UAIpliz17Ijmm2dKXyFpjxa+Ssfal8/Qyc/kT2i7WJgZ9xUDBk/U+1ZaiyTnZaUmMwZ5sXFFZ29DbzrhCvuei0i+s2LBHa0bJVuiJ2MMgcr9UvPLp50elXErGDMO7VcGORcJJDcTZ9Nzj5snmkP1pTxtUW57v55CFqfhH9goVFtLaIVUXY1Ef8FSorfsah1t9d/UWD+JSZMrAfzrTqDgg8Q1kYnIwERgLhM0pDQMYd5X/bHX9ato/ayN9+Z3swR0UDZxGOUScB5bkOxWWhTV93AE6kdt4wtLQrKqOijmIYVLZJ2ssQJmbOWB1mdzd2KdR6en8BjZ4TiMOzzjcxaOLf1RhSwyB9NyUhX+9IEsBsSuE4eM3qslJMwQDzjZ7+fgaKmAaHZayrE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(5660300002)(6666004)(86362001)(66556008)(7696005)(52116002)(66946007)(1076003)(316002)(2906002)(8936002)(38100700002)(8676002)(186003)(36756003)(4326008)(6486002)(956004)(2616005)(83380400001)(38350700002)(26005)(6916009)(107886003)(508600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vNm3N8ZiBCO9U0pVzhXouXUxSM+iV5VNrp9SEQca5ImyCc59eu7+kLolgTAO60rz+BAvyej/8JYVH7ga1Ch5eqHky0+zOskzd/XtHF2xRJJIrKXM2HHPP2c1CHXjOnmG37tt43hfjK5T02HqYqg2zZ6a/GonNizPRb3EUIzIQVcKMXjSXueZ5aAiYoXGYLz4YrTXUvYZ6ZkxQNjSjFIBEJnrEaBoA4WpZ+7JITf2ebtNFT3XRFT9bz9ZGuPJOkaoY9i//CrhTWQdDLMVaodxi66T5GtUdNYnEMA8dTPSEiG1Yns7KsHJIaraxpvPVvSwRJfyhlx3XccTLHZuc5TMJfd9vSsEGNTXvXUFFM1gG/diV2Kg0Bax5PpNYjb4lTw0vNh+tPPT/nBbKkIYPOCIHRRoGtYDNbYitqvJOrtNVe5HWEapbt50M/Oip5wEx4xDCU3UD8NZSSviVrELLGIyS1VW4ZSLxNZzuiFOPfOHb2ZmnF9YCB6ocQIEJWrFkXsauuKXLdZkxq8y5EisYFS6t/HldQ2tTSaTxRu3GQ8yF6/9SAPBhQM2vXhueKMwUgO5Pqf6LL8IzQVtRJbaXwfKDHfepdBDztO2puFOIAVy8PB3rPPvOxegy8r6kpGmWHyzc2f4yaH7tpVzamnPqM82Y6ORFSy/Xk7GeanrEKk/+ji4yXBIq1p3mAhxoMyQ+K71VZqNTKQVgYDftSI/E7g3Lg6eDyFZhvztrMrVUU3+h3s12gio4CN1nA1JwLOKKE87vlGOSh3wm/nrStE1gRw4W/mStFxlcRUHioIIAgAuCrxUaIto5UN4r8ZPAbO+ZDzbWsMHjv3Q0YYIpJEhkd234zAbsawRP1eeIxyLeagEk+lRJEK2zhdyqgA4tBPqmbWI+aFIHQvzni5GSnWUu9hqsVGS/VXJW1SLaeCQh8z/nqAl1Myr5LYIbcU7kPappyEQZ0dfy/aRN8LHZbJmiduMzEGvwsPq6vjdj7mTzw7ngUX/qI31Zdw3ilRJis2xYpR/cWmb339BfqvfMzjnWX/T5xomqJHnzOjUcopn5hf0QUNfS75OlHuysgE26Nd3dj0iuNwMlEOVNfP/a1+qfyWmOopbA0pr5sGhAj6tWDNWF077moEswtKgG1ly1Nu6Cm2BrotXytGsr0bvkz8+xmR/1JsaXB6qurZaZe2pInHt+Ye1xU500ewyfynbm3LAK3JYSxMIXRBI3yLrxXRhYqdqcGjJClU25TJGMi3RaOx2w74rD9d++74zyGlyDRFSUV1sQHaDXmNKrgdOGsXHkxOyoP9bkTFfRU6Ky7XYpK0DfvJAI8TtY6DaOrYKkq7nbrpMCQuoRkdPSbpWIcI0dKl4P3M2BnJlOGzffH9dgrMVlUKSjBXghz/a5fjhN9icwZX5sNqaMHzvpognTM1I4DbXx7T9x1Fk4XRVdsyt2XispYzJJpRmZY8TrcMh8JjlGS3MjUdkMoj8cT7iSDPTiVQLffKp4Av1xSkkvfEROlVW2t5Oa1rVu2Gx8KQYBxITYP0tlLFzUfqKb2DhUzo+7hMjmQUWfYILEVKxgtzPRFEP0Syg7rV6gt3X8cyydNRey14uJn5c+9hV6+TXGI+/A+Mt6p/5Ymv7nNgjp8CZ8/LRqiQ= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: e85e7aa1-11fa-4343-f222-08d9ba34270d X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 10:19:00.7987 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bDE3Ki25ldEcSuPGK6QA/mtcJVKfe2t5yAb76h+9pI6o5DDAImhGbr13Xpz36vRvaHJaMSt/m9rzvFyB9mDV4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6526 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 ; Wed, 08 Dec 2021 10:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159355 From: Stefan Herbrechtsmeier The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)' sets the branch= parameter too early to master and thereby breaks the -B/--srcbranch option. ERROR: branch= parameter and -B/--srcbranch option cannot both be specified - use one or the other Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) scripts/lib/recipetool/create.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index 4f6e01c639..406c97f1c5 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py @@ -389,9 +389,6 @@ def reformat_git_uri(uri): parms.update({('protocol', 'ssh')}) elif (scheme == "http" or scheme == 'https' or scheme == 'ssh') and not ('protocol' in parms): parms.update({('protocol', scheme)}) - # We assume 'master' branch if not set - if not 'branch' in parms: - parms.update({('branch', 'master')}) # Always append 'git://' fUrl = bb.fetch2.encodeurl(('git', host, path, user, pswd, parms)) return fUrl @@ -481,6 +478,9 @@ def create_recipe(args): storeTagName = params['tag'] params['nobranch'] = '1' del params['tag'] + # Assume 'master' branch if not set + if scheme in ['git', 'gitsm'] and 'branch' not in params and 'nobranch' not in params: + params['branch'] = 'master' fetchuri = bb.fetch2.encodeurl((scheme, network, path, user, passwd, params)) tmpparent = tinfoil.config_data.getVar('BASE_WORKDIR') @@ -530,10 +530,9 @@ def create_recipe(args): # Remove HEAD reference point and drop remote prefix get_branch = [x.split('/', 1)[1] for x in get_branch if not x.startswith('origin/HEAD')] if 'master' in get_branch: - # If it is master, we do not need to append 'branch=master' as this is default. # Even with the case where get_branch has multiple objects, if 'master' is one # of them, we should default take from 'master' - srcbranch = '' + srcbranch = 'master' elif len(get_branch) == 1: # If 'master' isn't in get_branch and get_branch contains only ONE object, then store result into 'srcbranch' srcbranch = get_branch[0] @@ -546,8 +545,8 @@ def create_recipe(args): # Since we might have a value in srcbranch, we need to # recontruct the srcuri to include 'branch' in params. scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(srcuri) - if srcbranch: - params['branch'] = srcbranch + if scheme in ['git', 'gitsm']: + params['branch'] = srcbranch or 'master' if storeTagName and scheme in ['git', 'gitsm']: # Check srcrev using tag and check validity of the tag @@ -606,7 +605,7 @@ def create_recipe(args): splitline = line.split() if len(splitline) > 1: if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]): - srcuri = reformat_git_uri(splitline[1]) + srcuri = reformat_git_uri(splitline[1]) + ';branch=master' srcsubdir = 'git' break From patchwork Wed Dec 8 10:18:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 730 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 5C534C433FE for ; Wed, 8 Dec 2021 10:19:08 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.42]) by mx.groups.io with SMTP id smtpd.web11.10317.1638958743676272816 for ; Wed, 08 Dec 2021 02:19:08 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=FvgMuc8k; spf=pass (domain: weidmueller.com, ip: 40.107.0.42, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BOjuJ3mukCGedj0QPNqKpVSi7dLZDyqu6fh14ZOgRRNthfM4fzpUcFoi+OharF1mu5SLVeZF4W/zGVXWsjL9EyuIQ/HKr1eAvkXabgMQIDg7AV5Q8BmLZXDF4XARfKZBD8fMcQxkAwIcxMh39EnDwi1ZEErJrpOl2n7KoRbJNgtalbM2XIzvOkiq+Rl93v5wmU/NzFsNkfcvQyVb1nvC0R6bPHNbTSvMIs3IBJL0ykkmdSu7jfoFaZl0K/EpYFf3VLxddv9dwHUXMmEERA0yMkLn2Cnj2M2Nb8O3GdOjjL/EAlbx0Hym2bQ7PcQtK1DgqKN5jBQ/BhhbbmYefuiJZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hNaI6tmxpVPpxYRr8Fx+BZ9nEZxnXxq24JawW4xAgTQ=; b=NjaxAeuKP5o2TKXzkLSPpfsuChIA2mkUD8hK4bVmyEX/ulzTkMS/rqBsZ4WgVx6CSzLMtwS9nfpmGgweZJ+r2G9KJ2aoymheOg+poGoJiKvzhHAR9/WeA3M88WbRksttCbrI+443dhsU72Q/faGG4iSyvEK3F3mUWlQUZ/0JGp8jIGlRMx+JJH/XXmktgdrwsGnq3L4adkA5rNGLs5g9077Yd6yv984KhUn2FE9RUlyUlVzd7dO7TB8i85KJmLuo/9biq04GzGmf77Y4Tfr+AXD9PahXYoIetero+xgD7Lloxz9/KdLCodNUyZGoo36CyFQLo4R5zdRJ7RNeOYaTfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hNaI6tmxpVPpxYRr8Fx+BZ9nEZxnXxq24JawW4xAgTQ=; b=FvgMuc8kGoiIvQVHbPUBB42A6YJdu30IvZAzjPIEEJWlE0H7ObK9LhKcnzpT8Ib8r83bOWUX+cR5oK3V5L+NHqzMVRnRbt2EXdaKYq7nwgn1pG6lbCREIbmaD5XDKk9AKny7rvN5oEoVW/T6+vl5hS9oBtxTtypxhTF+Jpu4IdQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6526.eurprd08.prod.outlook.com (2603:10a6:102:df::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 10:19:01 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%8]) with mapi id 15.20.4734.024; Wed, 8 Dec 2021 10:19:01 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 2/5] selftest/devtool: Check branch in git fetch Date: Wed, 8 Dec 2021 11:18:36 +0100 Message-ID: <20211208101839.16224-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.94) by AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Wed, 8 Dec 2021 10:19:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 825d6300-74e1-4386-01c5-08d9ba342752 X-MS-TrafficTypeDiagnostic: PAXPR08MB6526:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:486; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JAWmTd8rfVkaFq/nsrbpg5mRwnu0WoB2ZZa87/thJFlhuPYdWMf8xZFK81gpg7+rgxm3Qc3hA4oqmiFP0H4IKXjcrrK7YJcqtc569CoZcpCXKtraaTIXnkngPYV5J1TI6aJBxn62ls5ItEMzrPHl+p8HQ/ETZRB3/e2cWX3q//5wlcMxtwpMyNZ7SHq0ck5SmSnmGtJ374T81Sm+eXjA4azzaaQa8JQnWfU/OxYjK5VE6xDfA1OStPuri/ZxGZ/+UlifmScNZB7y2t+B4pVflQn6JnrIhpLEwr3oAB8pywTylrt7VJSAoDXSsiNo1WsEb9RDlvz26FWW3Gd4mmfujoBLOANxn0M2riKm3ljKtsmRIb8vWN8CShVhic3uxoIkxbHLylmBesoZ/VJ6M8dWWvn33kpnYD/Ga6WNTotoyQuXty9lMdMbLoV6DAWqsCg7CbeacFAtEZQFfmlUBrGy/fmiCidlG+4kFMSUnWUDRV3ZWM/kZofzhqwxXKxt9aJgUXm1guAJT1AcTOpqwN4z7Y0WXLj6Ho4miBklTZogIadBqn8B0Ip2SVmBm2OGeaqzhiBh7A8E4MEB4oab7WUU7XuiRBGJkMySPELNAh3L+mNsz4AgNkefIMxvQMsH3CKS30xC09TYWjuOgU4rOMXOOwPWfiW7I2/HKnLTsr9AMYpcAVTZnGW5wkSFp2VN+0ZnSOw9pUZlcqimYaakUMJcWA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(5660300002)(6666004)(86362001)(66556008)(7696005)(52116002)(66946007)(1076003)(316002)(2906002)(8936002)(38100700002)(8676002)(186003)(36756003)(4326008)(6486002)(956004)(2616005)(83380400001)(38350700002)(26005)(6916009)(107886003)(508600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MG4yozEHPVd2XlY7onG2lAbPHQak6eoUcz69JrzbAQGqcJb9eBQxCQlcOoGLBeIPfR+sYgbbycozGQdIIY0VMk+zVTrD7dRnwnA0vz6TMxnWeJ8qiEqb1RquywIeY29VoeOMOQCdce2RJb06mYaXLKBrNd5P76LdpPv/nDqVGr6FbipVHtq8nEX+5Tb6rhFYVKlhzEv97gnwUTOnHegTQ5kFhM6gwEu9bA4+y9UyLVoXv1e+fVjg+QNrz0NTsIbFQu62U1xRIfQzgknGLDLGe7K4il7ze/RLHqxm/EiR1i/q8le/SVanYiGRxFMAnN4uj5TTTckQl+8ml4zhHg3xJZuQFc6v8y89zSpmsWgRuxa0+YogNSeSMSmO6RZM/tyT76w3WCL4rjMsz+SHjlfLrlxNSC7VVl1L5H7tvgi0gu3zAnzG4AlLv4VFCz9kGumjQ7XJNaLskukUnskbPFoxJU/g4kQPbNZ7OplqXRPGVVHy7FNMKXAPxY0qK/gCVlluwXLei/d9c1CFaV74hDL94igPst8LkHw50G8xTnV4P9yW8894TdlyPRTc5ibSZB/WpUZOLO2y7qO8vjTIvgwn7bf1tiS6EWMfUnxQWNdJdD2MVNX4WcsNTN3Ic7EOl8X3Mv7uJPnveLdH2oTVkCc+ZtT4ELevq2GcxpCXrDpeD+5uKbU2kYKkHbFGSpbEb0GtNb+4cBHGKemtgRIu7pwAK/1zDSkPL8BVb8iE3Wd8t9eAgkCzJpCLQwlomGl/HKpXkeJ7MsLSLd+nBHDgzQp+nU35EETVHTXTPDtT0Oik8qPqvzNDC+6ONo68s6W5pKKf3OUU7Chai000gNyeeMzjDEYd0Wj5bIbVp+khzY9RFsTIY/I0cgHeEWDw6xw0bYclk1OHPHwUs13NiiNLYXi2NMzAvrGa0D/7GUXUn60gDjFxVvM2I8Z4YtRZ1o3bFU2N2TTjrYty5uU4mmN0S+QQas8XWvgwh1n/i2lOpiEe2r0VttCpJVEPSsVCfBIn4DQ2TAFK5muRnKMX9mGLoULF4+vn8j+BiZTC/39/tsiMDCj3pFB1JD7KZG3Ax5WKlztMtwKimN0WoXh1oW6xZsEWmDEvUItC4zKKT3yDH254a+c6uy8CHF2v0SNSgAIGy0ug9s2wSgbl/A/NTRc4qSNprZgiDfi5UU8Y0lEvDLO5CMYB8R1DHAw+k+gUN570gLw8XXyUL+BSSx5tQTOr73uFpjTKo9WeKV0EZNVe/UNlfeNr91Y94OL3GfFOneRPcX1jIitjZITkKS4OQOygchkE9wsMP9ul5nWspm+C87UMQVPJL2iDmjqdROiIlTl1dY2gvxfRN84yOx4/dmcwLn66M6/BQhBdiYIzJQEYCj2E7xqBBvGrRk2AK2zcCkjjuk+ZKWd2iWudTYO5HUD/QhzbYhSpzWiyADww0Hf1hrcpsBe4RdcX2plSKWv0bHH8hbYiCWjijxtMGUo1z3gH+DIhHt48MkXWHV3YhaNPUy9RraHuMSfWrsXGk6Wn9TtzD0rG4l8oEFIY/N7BPwTfHSe4ZkdXl+s5qTHOSfrEfQM+DkuNuEyW1xkGd8+WC4lD0KeYHN1cUvzLL6NNv+9P7HFzeZg/WOuTUL3LuZj4TeSRtYI= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 825d6300-74e1-4386-01c5-08d9ba342752 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 10:19:01.2348 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kQwwlTqvCwPiWN+cr0QcKq3JiJiBAmtTrdn5iAnTYDgFEte+KPUQRdDJt4boncQWdGtwbDLNoJZS5cpYYqPYNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6526 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 ; Wed, 08 Dec 2021 10:19:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159356 From: Stefan Herbrechtsmeier The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)' forget the url branch= parameter in the devtool git fetch test. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Add commit to check branch in selftest/devtool meta/lib/oeqa/selftest/cases/devtool.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index d2b31af80e..a2b4d7f7d1 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -442,6 +442,7 @@ class DevtoolAddTests(DevtoolBase): tempdir = tempfile.mkdtemp(prefix='devtoolqa') self.track_for_cleanup(tempdir) url = 'gitsm://git.yoctoproject.org/mraa' + url_branch = '%s;branch=master' % url checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d' testrecipe = 'mraa' srcdir = os.path.join(tempdir, testrecipe) @@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase): checkvars = {} checkvars['S'] = '${WORKDIR}/git' checkvars['PV'] = '1.0+git${SRCPV}' - checkvars['SRC_URI'] = url + checkvars['SRC_URI'] = url_branch checkvars['SRCREV'] = '${AUTOREV}' self._test_recipe_contents(recipefile, checkvars, []) # Try with revision and version specified @@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase): checkvars = {} checkvars['S'] = '${WORKDIR}/git' checkvars['PV'] = '1.5+git${SRCPV}' - checkvars['SRC_URI'] = url + checkvars['SRC_URI'] = url_branch checkvars['SRCREV'] = checkrev self._test_recipe_contents(recipefile, checkvars, []) From patchwork Wed Dec 8 10:18:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 732 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 6C5CBC433EF for ; Wed, 8 Dec 2021 10:19:10 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.42]) by mx.groups.io with SMTP id smtpd.web11.10317.1638958743676272816 for ; Wed, 08 Dec 2021 02:19:09 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=h/FvQTfO; spf=pass (domain: weidmueller.com, ip: 40.107.0.42, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=itPiqH317C5rc36brcTCMMKX3HsFZKKfb62IqL8LIG8urg9vYUcMGPNMIC8ordj7db0CvgpQ59HlQK3rhEVieXAiiNXvP9uIT7CzbICV4iXK45NIXY6qFnCvoS14cnD/KuW+pEY1WKnj4D0Z+qwqvvbqnPx95RUUjK2PhbOGaUQAPMtCJMNUKS4QWmrgVzbWsDTN5oZnD3q7ktjIz3i1zlfiKO3S5rBEym2lvzFhlHHiOpCjfPdtUsqjBQ3tlgZGmBzpDW99QlLSFi/zetmRdyk/26wpQElmo64D0fngTmGQAIxmUy1fe+X+A2c9Z4m3RCYXdY0h7F+4A6QE5aa8zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Cr2it97yq9HcJvkZkH+eHzu02I2mWy9gcWO0mZ0oaYg=; b=oFiwK68tV+SRfLPUOk2ZNmc+JJq5imyiQUxnxVHJM4FX6u6WEdq2lBffle/x68wXAFol5yhHW0HlX9a4TUiqpyQScIO12mgUoAIQyTwQhuBrLCXCaNmYMLirQzd4yWIbv0R1rxRXRJTLgwan8JKSUCmKd3k8JF8d2XiqTrQVRkHB06HEtoZgG4Ic7GQLij4Jt1DJk42zxmV82a5FFwsPYBRuXk1uu6Hp/xjCGH30+V85bBkFrd5gL/xLj4XMLu4SQ6C+969L3RBbUB0ivfL9a6yiC/cbRolYz/YVfftTG3vQQ2Vb6iLqoNczcbNV8Da3APh9W14vXsB/DnQYaSxVzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Cr2it97yq9HcJvkZkH+eHzu02I2mWy9gcWO0mZ0oaYg=; b=h/FvQTfOKxM6oRttuAfj7z+pghEwdI2pBoTvqbpSnCtIVoa8/5rQxLkewObVB4jVfL7ucUMIpLhrdss0lH46wfN9pc+Z8pA1l1vCnW+H9B1BDHNZPXWgflGLCn2H6GyKfW2YsOw9AeIwxK1ulNezFPKmicH0R/C8yHuL9+vzn7E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6526.eurprd08.prod.outlook.com (2603:10a6:102:df::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 10:19:01 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%8]) with mapi id 15.20.4734.024; Wed, 8 Dec 2021 10:19:01 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 3/5] selftest/recipetool: Split tests into separate test classes Date: Wed, 8 Dec 2021 11:18:37 +0100 Message-ID: <20211208101839.16224-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.94) by AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Wed, 8 Dec 2021 10:19:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 254a996a-27da-4127-b349-08d9ba342794 X-MS-TrafficTypeDiagnostic: PAXPR08MB6526:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:663; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8qTlGosem0WU8S24skk1WVJOGKO1pQh3ikvfoFzM6I4v+3FVVHYiuZX4MihH0ulQr6tjA7Fgd4LUgP2tMKXpnEqNZkahBSZjSiF4Azi/0JiBgLeG7QFBHxBV9Ab10ZjS4wAujRaweBOXjxEqgf+jh0cczNXAdFMzQ3mk95wzSiZkz0fK5RuaCp21MxzvoS9KUWV7/cLN9dNJdzLFY/XR8D/lU4Bum4F3ZjSH3LTRjAr8xp7RAwc17tMXyHqvkBPbXZa4UfD+t2vp4gO4RECSZZeVAT97uK+jD7p7kGjtfvrcWqo4x3c8uPPtUT/2Qr3/Etnhd/lYzW9k3CdPLZ6pbLMvknGoZhpJ/qaSBPRXJg0XJoHrQtb+CsNohBE3YuWfuHpcHQ2jrflJu+wZj5clUEek59uGgrGDt2vZnxbvsoopwlShAAQyHzQk8/Ip59GmATIGtSITW1jAiwBlLnscSaoIT9WD+7jbwH9wLm8ShhMeuvw4DjCLHqDNzRU+mizGHJvuW7cTq/h7zIRPvIOfq9BBWidTrH/+jVi+YsMDUH/Pe6h1mwBJtHuUosYCel8vwfBUgUFGHcRgA8YcO4QKhFYaGp15E+B8ucBi1YSuSmcY2K/KRHPq8U6VltkSbTVUjtVng+1FZklreSVV2jkE6ADCTC0qa+fi+rQUddtIU4ndbt6SPgl1hU4zPRLA+BcNfw+3RkhnlWj4y7ZI5qm5wQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(5660300002)(6666004)(86362001)(66556008)(7696005)(52116002)(66946007)(1076003)(316002)(2906002)(8936002)(38100700002)(8676002)(186003)(36756003)(4326008)(6486002)(956004)(2616005)(83380400001)(38350700002)(26005)(6916009)(107886003)(508600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9AVSr0aw6y19hK1u8bddhAdG+GiEVEoa3Wnng0FppxNCsBfhk6bPjpBZ9CD+7Mdxxo4AjYOSDDP3U/Ud+TBlBuwSgZoYez6Go/+/aLsMj4Ots3pAd1C+iI/WffhcMaQWxpU6W+MzQXefoZkNVMYuqa/tlvhVAxvgHdFXmkHWw8tAepcOWeRzFwKuh5zVB9ICmoR48Hcl/II2kscK1m0HDvhi455UNaWsc2wSViYBfEyLOvb4/wsX7RA64giu0eLbScluVWchMlP+7jtOmet5RCqyrR3vdJvXnysNPZ8yPPOuF0z8YQLK6EoIl6qv9bP9g89APjp0pdxJ84343580Oy5KAo6CXJ7TdEbeNNSIKBT0+7bXmOEimOFww9yjpWo4etpTufa4hbwcaKFklaXp0s488P8RFzeRR9JttO3m3Nhoe/q7L28wDF5eC2BJZYillnZraYaaj/2oP0PZ/lJLppylokU8v+zF2X8wY60ECz0hlwmFfkGQ7+LjCLqcol/uMildjlVSXgiKF1wJ1W7eyH/ZR3K8mvYMnHasIGVrby1qDFbl2pJ1j+pPPCvw8y2O/BjI7zm9zrNY0PO3QLfYTYk0gNQS5kkv4zJgxf4ZW6QBFTaw+byHgIKFdidfYbC1qjdDO9dTS/G1Oq93bYqMBONOMz2BQxF9dg64pVSaEwkCwbLpWXqwLSTA65Y+hFkIJczUWY26r+Pd8QfqNdev9Zf/+xdRGCt7dQP6/COPBFuAwMjDdMk/ouslYopYWb8kICoq2V9tTXbnXHShMkr+OmypSXl8roj7tkrM7nsefirkgAwv/smqs32P1KQ0gxSDkuCHgiwZY5cpseGH+mD6gwYc+ixVcpCoFYvDCydhRvb+yD+edTRbbMBBac2JgWTxlDlNN1CGTb4A9N9iCe7wrNTiXUrW5WdJ5QOwP8djWikQ0WkbSGR+elwTkSLLWSooGWz2u4kpuZy+XBkQILCmHv4hyvv9+ifvWNyiQOLgqBLMOHzmFeqxlKyl4oZpXEMtxSnhfbtuIvGWgBPcJHUv5xOy8g53jVaIlrYt4ADZaoJfx3dnZRdXr/oVmOortXAChYr/S12FOJeh7MWJPiF46qiDsQlTy4PXsPaxfg/85/bjWUSBgPCUqKC44MHPiGvdbFHuAtP6J+JnVbHmpxQ53Fiq1KNV4vOKgNc6xgZJ7G/cPkZAT1KCcBzzZMtY4DzKKr6QR/OiwK4wjR/kRAB2lhDnn2G503worKa0KnNGfMu5tzns2pmnqzdthVAN/DZdx4/EiOpIwOTVBegdewpWE8F6fN5WPeccXz0AJ8UP0u38RgkKqtsoIYZECYClIL+lXsPVekRl77oMEKqlDpxHT46anrUvM626gW9DEVSDBMB269QOfTGq1hckUnw4uA8aQ9MGmE5XrLbEWDiaoRXDMJze4WGZKHLSdr0j29O5HegiNDtuNj2/AcV4YxabDbq81pqAL9aNLqn8aJ5v0Vz0OObXCy1l6CE2e3U8VFuazLOXTwRrnwDYtdmz0ofhh9QRGa5LutwfVBqeFBrnGpDq1S7XOEhnuJBMZqMSdF3LRF4qUlYZxtBVV2b+7uWFqQlZVd8MChPDz8XHxXdUiNkGxYRvIFMNkF4z07qI8dX7QNU= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 254a996a-27da-4127-b349-08d9ba342794 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 10:19:01.6241 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 07K0XGhAmj2nYadYxcMqTPrIjmngrE3J0TJdgBORXblqFbpt/VY/IIDqy1Gsdq2AN2ogemcNL+rL8wiI75SXNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6526 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 ; Wed, 08 Dec 2021 10:19:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159358 From: Stefan Herbrechtsmeier Split tests into separate test classes to speed up individual test runs by reducing the test setup to a minimum. The pkgdata generation is only needed for the append tests and slow down the other tests. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) meta/lib/oeqa/selftest/cases/recipetool.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 8dc00ac10e..1aedc02b99 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -68,7 +68,7 @@ class RecipetoolBase(devtool.DevtoolBase): return bbappendfile, result.output -class RecipetoolTests(RecipetoolBase): +class RecipetoolAppendTests(RecipetoolBase): @classmethod def setUpClass(cls): @@ -76,9 +76,8 @@ class RecipetoolTests(RecipetoolBase): # Ensure we have the right data in shlibs/pkgdata cls.logger.info('Running bitbake to generate pkgdata') bitbake('-c packagedata base-files coreutils busybox selftest-recipetool-appendfile') - bb_vars = get_bb_vars(['COREBASE', 'BBPATH']) + bb_vars = get_bb_vars(['COREBASE']) cls.corebase = bb_vars['COREBASE'] - cls.bbpath = bb_vars['BBPATH'] def _try_recipetool_appendfile(self, testrecipe, destfile, newfile, options, expectedlines, expectedfiles): cmd = 'recipetool appendfile %s %s %s %s' % (self.templayerdir, destfile, newfile, options) @@ -332,6 +331,9 @@ class RecipetoolTests(RecipetoolBase): filename = try_appendfile_wc('-w') self.assertEqual(filename, recipefn.split('_')[0] + '_%.bbappend') + +class RecipetoolCreateTests(RecipetoolBase): + def test_recipetool_create(self): # Try adding a recipe tempsrc = os.path.join(self.tempdir, 'srctree') @@ -518,6 +520,15 @@ class RecipetoolTests(RecipetoolBase): inherits = ['pkgconfig', 'autotools'] self._test_recipe_contents(recipefile, checkvars, inherits) + +class RecipetoolTests(RecipetoolBase): + + @classmethod + def setUpClass(cls): + super(RecipetoolTests, cls).setUpClass() + bb_vars = get_bb_vars(['BBPATH']) + cls.bbpath = bb_vars['BBPATH'] + def _copy_file_with_cleanup(self, srcfile, basedstdir, *paths): dstdir = basedstdir self.assertTrue(os.path.exists(dstdir)) From patchwork Wed Dec 8 10:18:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 729 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 78562C433F5 for ; Wed, 8 Dec 2021 10:19:07 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.85]) by mx.groups.io with SMTP id smtpd.web11.10318.1638958745029393425 for ; Wed, 08 Dec 2021 02:19:06 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=OIYpFEva; spf=pass (domain: weidmueller.com, ip: 40.107.0.85, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cxdXKbuj0kzQsngTzq4tMMYja9UG+7IW2yHOQtrOawGkmayLCf/Sw2tBvgjtHBp6JBKKlRE4+13Hr0BbEULx0PRxSxOr8mTuB1fu7y3eiOsAdL6Exm5tmC3cFfPwnTuA+Exi5UZx8BTsiiXxbuFU/XjJ5hTwxuarbSSZeSLMWMm31ZS8HZUcHxRmCL25CLOqtb3q/mPMYvJ8DLKC8tVBnax3DFHaExikeP09XbjP3aHk52fZMMr2yWqidGnEcAJc/BimS+u+3xzzvyj8L/I7qbDgD0FS1jnyzOThS46SkB481huHYdSRYmuJMIAfXf4YOGMaw7QhP7ST08rC+swnow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=V/Ro6/LU+zRKn4RO4ESjxjtTjLiaDj4ZbsZduOMI1XM=; b=CfXyZB0i5GMg1/fApxMJkUV/v+a582thanmInItQOQHdHcMykAh9oY7rY05Nn7vOHst3fZwWlmkUI3eLKQdnTEyGDoNXUzlyQs6M2Ofu+uoifrAfmv4I8wTB7OYgkPMzB6xEp4psuWX843jpkCMrD7dNwTjqBAkAhs+zVystUWP/57aBLQUhfIBCCRkXufKSqmxgGlJH9BzyEBYHSjrOrYvGzIV6D/adgMGX8H+rzrOec/Vl7EOF308Qqc0Qo/uOuEl2KnLWVhcy6KQtGzPUhxY8RVYlNqQt2Jx81AJm4LzfXROU+WVULZEQFX5UvjhFIeznmb3MHaLI1stclgjagw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V/Ro6/LU+zRKn4RO4ESjxjtTjLiaDj4ZbsZduOMI1XM=; b=OIYpFEvaCtW2CAuqK8TA5T7dW+sfmg84vFItIRaVlkecLcI0QBOls+n9kZSse9Tm2soYn34ff7zmF9J/ze5gVUmmMi7UbNoEmSnMWZ4AHGxkjDtRtF1RbHurSZKTkgcTRU4dpdm0MpdJwEYiJDGs0UfOoVV6nCuGH/ProoB+T4c= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6910.eurprd08.prod.outlook.com (2603:10a6:102:132::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Wed, 8 Dec 2021 10:19:02 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%8]) with mapi id 15.20.4734.024; Wed, 8 Dec 2021 10:19:02 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 4/5] selftest/recipetool: Add tests for branch parameter and srcbranch option Date: Wed, 8 Dec 2021 11:18:38 +0100 Message-ID: <20211208101839.16224-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.94) by AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Wed, 8 Dec 2021 10:19:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2cf41633-b352-47c6-dc7b-08d9ba3427d0 X-MS-TrafficTypeDiagnostic: PAXPR08MB6910:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:201; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vr9B5tjqj9VHoo0APK5Y5+L6PxujJlBLMgtlprLAVfJfbhb3e/iOZuZ+9BHrGkQhmAkMUSIGiflv6M0sCto+UssdbdGjbGDHNOpKQpNVlIjs30h4UOXXJi2GOLew5FqefFYC+meW6r24JEbvjRc8na33g//XyyR1TP+AG0rAzufQtEbIhUYj27PCkIWlAnhcjOXCFGvOxE9XPZiZCyACgjcwnq4l0ehZtGV1vOGldNgKGGVk1TEemLTjQxUPshqXRaQxlFoW5ICbFthcfYPh/cME+3wK4FC4L/sPN/cVRuSoiXPSYo2iRR/7d51s+xkcwDDyt24PaXf/ZuZJJ4YXUuecBRIasU0ALlRk9sYBB8spc/kcO8dFmY/it4r2sChddFQs1PM2AnSOC/2BTtxHHCtZ+okC8+f8BP86lDErlN74zUQH2vhBY15TvLBwTgtBC14mgvr3LpUE8/xpoM2j6mrX5ovYs743IV/u/emkHDZ+JCXujosL3SoNifm7FxSwbpPpcxzZRxTNoOIn228cTDRyETFtkvo9ZJ8mSrcU3KGY1vwb/MCPjCNYoz/UWo6tUt0YhKGddagYW5YXCU93HDvy9nzO4FJNTvnT3WAZbJiuuRDa2ZWqSk9L5azdDJ+OFnETkWTEcIY/tuh/rouf6J/nRfhwqd+/yZAt1idq6jcjZ2SVDyp07JVn6KsVeK6XxmBrLmeuzmcE+iyIg1PjdtB5kj1T6lx3cEvNdBDRbSXHwYWZR9tn9IshXMo8CZ48+X9g9lPZJyd45iwBrkT5G0fjNTgSU3HrYspgFHJ5seU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(5660300002)(66946007)(186003)(316002)(6666004)(8936002)(38100700002)(508600001)(2906002)(8676002)(6916009)(4326008)(107886003)(26005)(36756003)(38350700002)(2616005)(66556008)(956004)(7696005)(66476007)(86362001)(1076003)(52116002)(6486002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: soHEnwJZl1tim7hFYGpYSCeEVznYYKerl2YaOvfaZGbicrH1og0hwNd8MH9AJvgUeSyIDDo86fxk5FbN+fUNkl1rMwvjHpLmw/jodzFG73AnoMn3JG+j1fCSlR8Xi5fVPhhUySo6JNBp+GMlEeZWISk1J4RhaVrcBOBBPe/fjeamgWaKDQQIxPpIJultUGE+feq/6NEINyncfkz6YiU+LeYjNpaY4FjV7vGahjqdJk9F42zVyws3A99LE7IFqTNtu32xDDxA5eksb8prZR0LkuX1vDN517HkEs6wm8sPKdSPl2VTnf5mv0p5Wkrrxi8JfHOTAFvDQoj10v/zR8r4sSX7h7kDfb8LaJ6EVe+fjtHudYlcTKuo3POQ0lswyywq4nPG0Jx0C1j9OiD/K+dtr5myf1o810NunLjx9YbuKEgK7xGMUvkXIY3zP4I9xjhqEvI+jQqjtM3blqh19MQTvY7D8wtgBJMnKR20f4z9R75bLW4DOeTYTvxGMJGRO2NFd3E59I6o5gLSEKw/KQ5ixxyo9WZYRiuz4RO7tpApQo4kTYgM3iJS2ZZcRMh9kcRZ/v1+PlsH025l6nnfgFJPs1P2c1kn3E3w2DqK5kCPBz0D0g/K7n0AyhxOgo0ekDaHzWrhqrXr4aSb/T+yi3d8I3k4CwTZjrQvtUw5YHD4fx/uLHp62tzYI5lShZNeMNpd8Tz7YUenKO+Egm46yAWkRTn5rgCtASTYR9l4EZctRozvbvbJFKb2pIZxUzURcxwFH6tV63hyD1viZ2GRQkx/G6IKo/Yw9ft8FySMXw4LQm6js/jSu1HFAPBWBBTzoQ/1lUo8x+SP6/edipy+Aq6Q1bxtrIrqTnAUdpUVyh0xsT3GCsz3U9FODRzwaVDrvJnL70HcdIZnkAAIocoljIsIm06hn+0oXoZjnkH6gBeGMIk+SBKyC1feJz3TRoepzmoMZrCoJO9bo14Ab/N8hWtVM6GXELIcdurbpPWCW1VfscJOgNKFiHCM33+AHmdovGCjgG0Hft8dwSSmmN+zb9b1h5wfnGQnon4GHTpC8A+JR6B1MYzA5pLv5rt/VIXShk0gkkqYlkO50zaIiuqXlZCH7X4S0uI5aDunWC49HxnTjjKm6X5hXoj8654bCN1UjW5iLw2Yx4fN28mUIizdSvfbNQxfkSocqTgX66Kbs8USgydg8jC33jUEgckPqATZ41gWTjKQ+sGFEI5RLhCfUeVBaCHN3VEFabOGjGkpar8LMng8QsHIoAmgncqWyPd/bS4H8zkvOK93dg/f1tNl+jMYSCCmIKNO+FQeddbOQDzWJlawZwb+dT/qltOSRVLjSF0vP28ORgZv5kW1bSwYCJ2hFDLBcYEzxXBACNoTWL18QbwV5YYv4L3I5Ps5WGlp04qfzmfJelJq046ctPVLRDpEHYm36rLtGM3ZrVDCrBqmoWcZVW8wTQI55dW8GpvxahZ8+v8vswbVpRlj3hA3shlRdFIYvNezKF7NJNOtgKClchQZ7pVOsuxI10NWB4MNz86SAwt91UZ+fKn4Bj1oph9/VfLOOmie2tOIlh4E8pVPkrhcml+nsofjNqgQSPx9mEzoWI2U6ujvWoo5P/BLy6tz3v0YkupwYoN3SyjyVYhp3EQ= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cf41633-b352-47c6-dc7b-08d9ba3427d0 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 10:19:02.0064 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BsRoz6h2reOljzGQqq73pzC6CusAeo5n/Yu4SFtZVk/QyAq7VIRs3zKoAfSaZETcMdAl/OlpvA+n9jhkGYJKtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6910 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 ; Wed, 08 Dec 2021 10:19:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159354 From: Stefan Herbrechtsmeier The recipetool support two ways to pass a branch and fallback to master if no branch is defined. Add tests for default branch, branch parameter and srcbranch option. Signed-off-by: Stefan Herbrechtsmeier --- This commit changes the test repository from matchbox-terminal to matchbox-keyboard because matchbox-terminal has only one master branch. Maybe the test should use a special test repository. (no changes since v1) meta/lib/oeqa/selftest/cases/recipetool.py | 38 +++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index 1aedc02b99..b77a2712f5 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -350,7 +350,7 @@ class RecipetoolCreateTests(RecipetoolBase): checkvars['SRC_URI[sha256sum]'] = '2e6a401cac9024db2288297e3be1a8ab60e7401ba8e91225218aaf4a27e82a07' self._test_recipe_contents(recipefile, checkvars, []) - def test_recipetool_create_git(self): + def test_recipetool_create_autotools(self): if 'x11' not in get_bb_var('DISTRO_FEATURES'): self.skipTest('Test requires x11 as distro feature') # Ensure we have the right data in shlibs/pkgdata @@ -359,7 +359,7 @@ class RecipetoolCreateTests(RecipetoolBase): tempsrc = os.path.join(self.tempdir, 'srctree') os.makedirs(tempsrc) recipefile = os.path.join(self.tempdir, 'libmatchbox.bb') - srcuri = 'git://git.yoctoproject.org/libmatchbox;branch=master' + srcuri = 'git://git.yoctoproject.org/libmatchbox' result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc]) self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output) checkvars = {} @@ -367,7 +367,7 @@ class RecipetoolCreateTests(RecipetoolBase): checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34' checkvars['S'] = '${WORKDIR}/git' checkvars['PV'] = '1.11+git${SRCPV}' - checkvars['SRC_URI'] = srcuri + checkvars['SRC_URI'] = srcuri + ';branch=master' checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango']) inherits = ['autotools', 'pkgconfig'] self._test_recipe_contents(recipefile, checkvars, inherits) @@ -506,19 +506,35 @@ class RecipetoolCreateTests(RecipetoolBase): inherits = ['setuptools3'] self._test_recipe_contents(recipefile, checkvars, inherits) - def test_recipetool_create_git_http(self): + def _test_recipetool_create_git(self, srcuri, branch=None): # Basic test to check http git URL mangling works temprecipe = os.path.join(self.tempdir, 'recipe') os.makedirs(temprecipe) - recipefile = os.path.join(temprecipe, 'matchbox-terminal_git.bb') - srcuri = 'http://git.yoctoproject.org/git/matchbox-terminal' - result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri)) + name = srcuri.split(';')[0].split('/')[-1] + recipefile = os.path.join(temprecipe, name + '_git.bb') + options = ' -B %s' % branch if branch else '' + result = runCmd('recipetool create -o %s%s "%s"' % (temprecipe, options, srcuri)) self.assertTrue(os.path.isfile(recipefile)) checkvars = {} - checkvars['LICENSE'] = set(['GPLv2']) - checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http;branch=master' - inherits = ['pkgconfig', 'autotools'] - self._test_recipe_contents(recipefile, checkvars, inherits) + checkvars['SRC_URI'] = srcuri + for scheme in ['http', 'https']: + if srcuri.startswith(scheme + ":"): + checkvars['SRC_URI'] = 'git%s;protocol=%s' % (srcuri[len(scheme):], scheme) + if ';branch=' not in srcuri: + checkvars['SRC_URI'] += ';branch=' + (branch or 'master') + self._test_recipe_contents(recipefile, checkvars, []) + + def test_recipetool_create_git_http(self): + self._test_recipetool_create_git('http://git.yoctoproject.org/git/matchbox-keyboard') + + def test_recipetool_create_git_srcuri_master(self): + self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=master') + + def test_recipetool_create_git_srcuri_branch(self): + self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard;branch=matchbox-keyboard-0-1') + + def test_recipetool_create_git_srcbranch(self): + self._test_recipetool_create_git('git://git.yoctoproject.org/matchbox-keyboard', 'matchbox-keyboard-0-1') class RecipetoolTests(RecipetoolBase): From patchwork Wed Dec 8 10:18:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 733 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 5DDCBC433F5 for ; Wed, 8 Dec 2021 10:19:12 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.85]) by mx.groups.io with SMTP id smtpd.web11.10318.1638958745029393425 for ; Wed, 08 Dec 2021 02:19:08 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=43OGb/Hk; spf=pass (domain: weidmueller.com, ip: 40.107.0.85, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q1dcqsRQW7F3TWTtEbb/oC3dh93GypFAW8OQ8ewl4lVbGYA4dJS3+eP+XlDR/8Sfv+boZrtKqyEDXQegiANj0QtNrB2eKQB3g94xm16oVCfOkhX6cHEUnIDT0PzKrrLyPA4B9z//pmp5Vgq4bR+iTS1rlQwqFvqi5g0MefkmMNxmtyh89KWrQMNk7QU0WzFqZKwWIJkbYUThhg2+7PdCHRQBmoaujGd9+s+sRsT8ozQDjLqSWbpoBny4k6krcwfY4w7F8b29htfRYkk7VErrCr+Ivamous1uvlttaDYLx5BVDelVmMlKKjVZfBzyu3RoGM9bemaSHp5MQ6Hfji36Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CAwNu8WkJqyRP7YvxYzdEXo3cgn2P2SlYxmL3VyE5Ys=; b=n+2GmmCESlm+cxrEwU3T15VO6vHH7oPHrRgph1biMVKMmupkCRocm4Zv6/lfb4/eCPms9D09KdqdAKHSBHRelgaM1TxFuGsTytXB2f2cwH7kvep29McomssqZTR8d//JUKuridSw7FdNoR/GsplSP3AzZJjsyTSvAcHkg/gZbYEMOFA8jjDNM/nC1ZfyNhc+8XQP4nd/WnDodbrRT0Yeaj6E2JcOE5ZOlaZ0fq9Q/2rXbXMLIEICwDlC3DTgkTkjR+KtrMd2cJ+okDg087JVyDL8YTxGIVbzNi4q8t4ycJ0IUgAUrNO3AsIIDj9YKhHciNkGiEJw6io1FExNI0kqgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CAwNu8WkJqyRP7YvxYzdEXo3cgn2P2SlYxmL3VyE5Ys=; b=43OGb/HkeylH8RMSLBeu51BXhWbrC1OT1PZnDqrdokEudYhG/i/Fc37esjcy4Sj36spYdNiRKho6L9w1VImQy/NQ+s1/igkmyCktEBmTXp1vGDNYapS1NZEbuwEiLsab05wGxi2NbN/y10hDiIhgMIN/fn4oa5tNNq+7tL8ZFu0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by PAXPR08MB6910.eurprd08.prod.outlook.com (2603:10a6:102:132::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Wed, 8 Dec 2021 10:19:02 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f:41c4:eb10:5010%8]) with mapi id 15.20.4734.024; Wed, 8 Dec 2021 10:19:02 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 5/5] selftest: devtool: Separate common functions and devtool sstate setup into two classes Date: Wed, 8 Dec 2021 11:18:39 +0100 Message-ID: <20211208101839.16224-5-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20211208101839.16224-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 Received: from DE10512.weidmueller.com (94.134.181.94) by AS9PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:20b:462::7) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Wed, 8 Dec 2021 10:19:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 421ed6e3-c1a8-4f93-ef14-08d9ba34280d X-MS-TrafficTypeDiagnostic: PAXPR08MB6910:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1265; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dE+W4paFyjc5D7+t1v+HSPp4wj78z9JBwwDZMDkCn+7i/EwXliK9/AdSJeVK0eIN2Aa/wAqhWU/S3MI56WdfAXkKuD+smYYfBRAd0wpNbzK4LY5tHEAjC3hTF/SSy2l9R7r5/sUbVG6JSIC6BmoWLMJ5Y8/oA5Y2/e1NAxmVSi60JpcjFVLscnMAJU/weE1VzN+0cEClRmYsDynSllXZr72R9j7DGk9uPZui3arfO6hmna/BcSAPnQNh+pg5U5GLt7gdWnjKsIBI32so1YGwLpX1uJmICSTB70/i2hp0Iz3h9nbyhlFXcVytXhKmuWCT3w+bX+bhJm+Pm8H5gS0tjoYjSskOrtlM4hGrbohRw6nXlP2HIvs7+mdsC9hjBMXTxzKgKJooJBzg3wniowg6cNHIdKMWaQvQnEgc9fO5KKjH794rgs0PMMMyYHR6Iek6pinpliKh//xfengXCSVnTOJ4GD6wHuyojvoYitWvc3BSGP/Q3wWmRlObQ8Tlrmycsh15PDlVIBcIvSxBW5nY1jGmz2OIj09nvUg4imLM7KN2Sa74HCoV7HYc21BExar6ueAxFplN5nsIaPTgesG9NYMw2VHzxRS+3KayVHzza8A0bvSvOd1uxV+fDHFfG71fHoutboU8H4Q3VxYdVOtGrvyffXLGq0vtiEDjeynuOGUXBlUTuG1DdpHPpMpj4BnCxNDey+0h0HWGaPTAHC6CIA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(5660300002)(66946007)(186003)(316002)(6666004)(8936002)(38100700002)(508600001)(2906002)(8676002)(6916009)(4326008)(107886003)(26005)(36756003)(38350700002)(2616005)(66556008)(956004)(7696005)(66476007)(86362001)(1076003)(52116002)(6486002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qBvqQNX6F2uqK9Dt50BEeooJde+zUarvgEk9D6InG/8WcNiP22JUT8cWpoL9YTQX6tR+12o4uQkz5BC5wtXCLVB+dzAuMOJI7Jj9a5DaaFZ5B9WKqpjCjAdNOx3NEQLoaQ9MktlmypZyHg6rwmtnTn0Xf5El61DhS6dXjMU+0VBlBnQWTnTRZUCx/tw3xo5+SWd6bg/XnoYtH3E9dSYd+GWs+i6welwA9weR/x8iwfbIYOdohfSYdjz5wlxZv8I97odTqOLOf1UlbzcAfQu+mCB6O1SSqk7910cjWSRflxzq7CTTEfS+4YB+sdy0m/8OwTKB0eN2MSZ+Jxgy42MccYuwHn4Pa6d88oqeQomrI9jzxGdriO+KMvGhfhWrMGunYSEi+RIRD7wWUlfZ67kUjejSpO3x6u0ZihPPOZo3Tn/+a7OLZGoeUDFM4+fUqP5fdpk1+pt6zvLucW7EKdB9ZX+jkoeXcSJfHLnIQXAcdA2SrTgwIsbPhpwYY8dgJJwNSuwCK6VRFhLSguL/zn99NtE0WRvk8q8/OfTeqy3LN2957cbdKyZFGkOoiqXKKVEdEg16g63qigBkdTPsM0zpsyXm2usFz3gX4PMLt96DbQN0CmAp3szVWc06Z36EGvw3puwq+0bDVBjZLZ1wcMxnNYI8m8nsiVPH28o6TmF//PKos1tCiFCg8cwFBygMJQHH0Jtkir2w6w0I78+6XMzKBZcaNGP1w8B9ipmwQUhc8dkJ7H474fMtd9LDrLZqVR85R2v62Ocx47HL4E5biEPdiAFttuGl9HKwBEaG0hyUpK8cqAbiPwDzR8BGCPgndXiLxhnXf+lTuY/yldEFOb5pBTCaVe+4rORvvf/wXkXkzLpNGgccRUOLJZHObe+z/IVyf20P8yyU+hryJVcuyZeApVyBdODadzVQy9nPsp4cKJTPn73iOej9DsG1WgodpYhNwutO3GoM3RpwmBxWfxNJ3CTozdTKm2o+cNZN/QbCaiN9PyNuZjwU98r/9uT/sB8iA+zAUvy+W/scAJzbqozDVPIt8zkKI4s8Zlx7wYO6tC2FltueNFR3QbLILkhk198OpLdZmCRyfWuIL8ah2Qavu9gZeRQFS9XT34+wMNE4wquFUb84YpXBli4KHjcs4V+uWnolyxNNExWiY/NNE4Fv0nzcUemRZqhZ474as2rjeXZm/vF3rcImPgCdshxLVhCfERIp4OR8gdMeAfZS59MRHcDYy6FV8K//Tnfu95PseX3GSrftWuZ7rpCBYZIZwXMdIFxVeDtXrBVfvx0ZlqsUblJJXzvviSxvjzftzFUNVKeXialoobMPxsq8vZkTtiIvWfDfAGA+aL+mn8cXm/Mz5HAtnKL8kLGD+OkFoRIdBdNHcsZhFfUj131iW2nSOsuiV0KXgVR215v8iXhgjFLRV9m8SC2MtgA+Q2+Od+oWEGyVE2ipvEkGU1q8ktqR40gEo2hFrxoY2wdE4CjIQpVkSQOctI3PPJSm6FBen9YnUt59yAbYIgmC8eiDtW2DXJZ3PnhVtqMqaxML6eUJzQfm+pKFdZjspQSiCqQdb/w/K+x3HcS0GEsJp9Ieo7XmuPjNFjsuLBhID6RiOiJVZXCK1RWJWJJvWxk6g2HXsNTF58Q= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 421ed6e3-c1a8-4f93-ef14-08d9ba34280d X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 10:19:02.4087 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Nd4/Y+bl6lj7mYicjjZABPonXXBW+0Js4GPDDellz1Q2PNoSy9wy9iZIHHbBArcTxBNEGlpMxPjGrHhkt4f/pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6910 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 ; Wed, 08 Dec 2021 10:19:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/159357 From: Stefan Herbrechtsmeier The selftest recipetool base class reuse the selftest devtool base class. Thereby the selftest devtool base class setup its own devtool sstate and the selftest recipetool classes trigger the build of recipes. This leads to the problem that the build artifacts doesn't reach the persistent sstate cache and rebuild on every selftest run. Move the common selftest devtool functions into its own class and use the sstate cache in the recipetool tests. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) meta/lib/oeqa/selftest/cases/devtool.py | 45 +++++++++++++--------- meta/lib/oeqa/selftest/cases/recipetool.py | 4 +- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index a2b4d7f7d1..23d55903fb 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -80,32 +80,15 @@ def tearDownModule(): bb.utils.edit_bblayers_conf(bblayers_conf, None, None, bblayers_edit_cb) shutil.rmtree(templayerdir) -class DevtoolBase(OESelftestTestCase): - - @classmethod - def setUpClass(cls): - super(DevtoolBase, cls).setUpClass() - bb_vars = get_bb_vars(['TOPDIR', 'SSTATE_DIR']) - cls.original_sstate = bb_vars['SSTATE_DIR'] - cls.devtool_sstate = os.path.join(bb_vars['TOPDIR'], 'sstate_devtool') - cls.sstate_conf = 'SSTATE_DIR = "%s"\n' % cls.devtool_sstate - cls.sstate_conf += ('SSTATE_MIRRORS += "file://.* file:///%s/PATH"\n' - % cls.original_sstate) - - @classmethod - def tearDownClass(cls): - cls.logger.debug('Deleting devtool sstate cache on %s' % cls.devtool_sstate) - runCmd('rm -rf %s' % cls.devtool_sstate) - super(DevtoolBase, cls).tearDownClass() +class DevtoolTestCase(OESelftestTestCase): def setUp(self): """Test case setup function""" - super(DevtoolBase, self).setUp() + super(DevtoolTestCase, self).setUp() self.workspacedir = os.path.join(self.builddir, 'workspace') self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory ' 'under the build directory') - self.append_config(self.sstate_conf) def _check_src_repo(self, repo_dir): """Check srctree git repository""" @@ -236,6 +219,30 @@ class DevtoolBase(OESelftestTestCase): return filelist +class DevtoolBase(DevtoolTestCase): + + @classmethod + def setUpClass(cls): + super(DevtoolBase, cls).setUpClass() + bb_vars = get_bb_vars(['TOPDIR', 'SSTATE_DIR']) + cls.original_sstate = bb_vars['SSTATE_DIR'] + cls.devtool_sstate = os.path.join(bb_vars['TOPDIR'], 'sstate_devtool') + cls.sstate_conf = 'SSTATE_DIR = "%s"\n' % cls.devtool_sstate + cls.sstate_conf += ('SSTATE_MIRRORS += "file://.* file:///%s/PATH"\n' + % cls.original_sstate) + + @classmethod + def tearDownClass(cls): + cls.logger.debug('Deleting devtool sstate cache on %s' % cls.devtool_sstate) + runCmd('rm -rf %s' % cls.devtool_sstate) + super(DevtoolBase, cls).tearDownClass() + + def setUp(self): + """Test case setup function""" + super(DevtoolBase, self).setUp() + self.append_config(self.sstate_conf) + + class DevtoolTests(DevtoolBase): def test_create_workspace(self): diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py index b77a2712f5..439e41597c 100644 --- a/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/meta/lib/oeqa/selftest/cases/recipetool.py @@ -25,7 +25,7 @@ def tearDownModule(): runCmd('rm -rf %s' % templayerdir) -class RecipetoolBase(devtool.DevtoolBase): +class RecipetoolBase(devtool.DevtoolTestCase): def setUpLocal(self): super(RecipetoolBase, self).setUpLocal() @@ -72,7 +72,7 @@ class RecipetoolAppendTests(RecipetoolBase): @classmethod def setUpClass(cls): - super(RecipetoolTests, cls).setUpClass() + super(RecipetoolAppendTests, cls).setUpClass() # Ensure we have the right data in shlibs/pkgdata cls.logger.info('Running bitbake to generate pkgdata') bitbake('-c packagedata base-files coreutils busybox selftest-recipetool-appendfile')