From patchwork Wed Mar 17 04:52:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 363 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645558oor; Wed, 17 Mar 2021 07:52:52 -0700 (PDT) X-Received: by 2002:a2e:94cc:: with SMTP id r12mr2605273ljh.373.1615992772363; Wed, 17 Mar 2021 07:52:52 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992772; cv=pass; d=google.com; s=arc-20160816; b=jIePEW9oD1/XJx7YtlA+lSia8NXju76Npt+r7YVuxy8kqPtJOqY+xlSWVTrVG6x6Uz 2hHPC78aabSRnn/Ny7gXYV68+gbgMcrcgyUlECVuSjney0+scRAnXSRJ0SltKJU5jdIq lobkJ50XRPynRJ54MZnXO2olaNueS4IIqOWT6wz266iNiLbphrCL/53DOLb2mLGMzgSb c9mZBJ4c7F+1yDhQVps8j+gvBshMHL45hfJNDL0NId58UAcMbzxZaedhML63XYbIkIfS a83KMJuHh/A/PJR2sh7/Hczk/1SeK2qJdP0WX0X/hgNAkZXSUpJB1PdvgY3NgLwnPV9e txAw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=OEjrVKh85Lbi3fxcXYvDLGiueONUezzvFbFSrT2FZmk=; b=hug2u9OTbboebyO/17u97p2AjmrfBzL3yP0AzZy8lTOqCt2BFYdLqZUcOfpby1Eebm gC3oHpU3uvBrS9ltOEWAxVnyy/9h0m5qyEyUViELVtwXykK0O+3YzNF4KPHQZ56DhLoB NHjkHP7WbVhp+Bi5ueGZ1BygD69rlcfl5DYuuygmeCOEn0QlnX+L+Kdq/hqlT2zTz6Yp pcuJQF2378P7E1PJwPvjjm0XodT+m8NHaIrE4Yah/bXN6zvR0b7NjOqAaOW7c+Y/4psF V2dL0imK8xezC0Bx43S3bSx4hka6luJR4Ev/gWN+KuaMFzg/+yiXP0iCts1KIEXqpLb0 5N4Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=WDVnDmJl; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbq5pzcbamgqesbeh2py@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBQ5PZCBAMGQESBEH2PY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id l6sor9555790lji.23.2021.03.17.07.52.52 (Google Transport Security); Wed, 17 Mar 2021 07:52:52 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbq5pzcbamgqesbeh2py@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=WDVnDmJl; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbq5pzcbamgqesbeh2py@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBQ5PZCBAMGQESBEH2PY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992772; cv=pass; d=google.com; s=arc-20160816; b=L0OOxAHaiK4TjSZ+UulfAxJXH/T9QJPlIgkMPeBdZ7iKWPj9O8d3rGad/lRyStmuB9 pUtwnHdz+DoaQ97oR2RWfb+hiKuMLM0yzG37VgF+mvj2X9qEujlWhWx23b1Qx3CSaDb7 /AZzUvaNe4zWsJBc4TzOCh+xknchDZGoS43rb5yg32HCBltVrMyHNk6ZSicAC3unUjU1 srOddfCB9qV7R3ACJ8jgY36WgbQjfdDuY4UQ/83Y1fnx47o0BI3SpfHOKuKwU/aF4rU9 gAyb91yqIyyZD8OGdLdwhdVvdV45lhbwIWuBryxwDZPjp5jWqZRAnw+Of2flHiNqCjDr ikzg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=OEjrVKh85Lbi3fxcXYvDLGiueONUezzvFbFSrT2FZmk=; b=LOAbk2PIn4U8k9i8AUtn8Gg5Mdng5Cg14P3uRhKhhceXxlfwI+4wS6oLEjeQxZK12J S9sgt8heMUojxoTrWYDtowNDHYfswO/2Xrck8lu57rOUmSntFW74XjwS/R7BbUkUhgOh +eiClWFimGDqkB2AUh6fcvNW78xhdXJZGRiOJXVLapWQS3PqY1hdyoC0R2UI6MGMGEKt 5guxmsCIHVq+o4JS9pM2uDJ3yfmWej7Y2hsYFP2XFPx7aZ00dJE1VkOClYHlwso5qwlz 0BA1MINOv0c0YuAr8BoSjhyuojmY1HLwxJJp2YBIzrRmVww51VQNKq6vZBdURevNth/y X5og== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=OEjrVKh85Lbi3fxcXYvDLGiueONUezzvFbFSrT2FZmk=; b=WDVnDmJlKNFxYhBsfCY55mhbO62wNRLPaBX+aNY5KezUD25KM3U3zS35W6KQAc+QiC C4WFCF746++gwkrgyfRMgErLB4Whq8FM6IY2BfqX8J+AtHgj8HtTEQ/QrxFyl3Po/2qg EgWmvAlOeUBp+CMmDflGVHC52Lj2yjW5cIauiZRTczCY/dCVG6tSTjy7+7f+3DHzPAMP YPEktKpzvMG4WGuaisBqKO0qKkWU9a3ZVy5WLKiQEu3lkBqTO7sJ3e64siMicrKgspFr W7OpY+Ic6xxsK9eN+qMx5FXxtBcEuLl9Q0kK20HvFQEaWdIz4C6Hp/8U0k7l+QqeMIAT Sspw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=OEjrVKh85Lbi3fxcXYvDLGiueONUezzvFbFSrT2FZmk=; b=LYc2eJ30nBocfkJo489HnDl9BMrLaxcHi35wDYn/xHqBTUNUvQsRtQJq6+5s+fH9ZB 73cN/cD1CGaHvBDCzigx1sT6J44hCA0TvuAQSZJyKW+lry01CRhE+J9Oa9l4SHsK9uLD BqeANzPT17DBJ9d7a21T+umM6kLGNJzLNpTlotQXAQ0X3HX2v8sOny/vsAdSwybE2gE/ N2ogGJyMYIuo8hMbLWnfgtT6sxDIeSPj4DDsCDZsK23dRFiT7PrLcgGu2ciGSk4mK7Jx SXq7NbhQLRJmY0lmPtlO/d9imiMvgGxZ+uEQfn9ihgMIgWwwkQBfRM056HQD+5xU50Eg cyRg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530cwgy8/M8FieQvzuGb25iJQag4ewnkhgnEMBuAtiPVOHCg/eyt 8zpibObyZ0oqG0x1pBSepZc= X-Google-Smtp-Source: ABdhPJwV1/o51wMf6EEgYDSaIGpB5KdEec+VlvE3Z2LSiJ6V6s8QQTaOcMH0XvgiRUHFe1+CgTZMwQ== X-Received: by 2002:a2e:8e78:: with SMTP id t24mr2763961ljk.161.1615992771932; Wed, 17 Mar 2021 07:52:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:e86:: with SMTP id 128ls6948948lfo.0.gmail; Wed, 17 Mar 2021 07:52:51 -0700 (PDT) X-Received: by 2002:a05:6512:a95:: with SMTP id m21mr2586057lfu.460.1615992770957; Wed, 17 Mar 2021 07:52:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992770; cv=none; d=google.com; s=arc-20160816; b=i0r/61KpcSfrnu+XjMcCTQxrx2t3agB0hVyniqkrxmVbMtyYPVMI+DxAeWbzFyCQXD PCgDHPpWD0Ydi2148DsmMRC4UlQcHf6RvJNGRalCcvgvkiBeozcArctzMxa8eA1Li+JZ pi20StNZnDwh5ZiZahfji+WjQAte5Y/9JiJVzSNoalVCPjQeynBqCC7hkBaUp9owazPX TQmj5QZEvBZdusdNTPCL2aeQ8V0tCzp1FFZTcGxVLkpOpLVBxQnZo4LHQQB4IBiYtP20 Rc/d8G2zM/bEcznMHcoce8bDYILojZcupLXQrGdQ/NWecUDg7pHZt0Be+DCyp1HHr5p0 ZIug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=KER/P2bMSbBAO/WowYSqp9An0CVdAKc42EwH2nGxST8=; b=LPaZVOA6E1a43kyjGJ3PB/VLwJj9jbUzHM+9UN3aRnNcYS5m7eTJoYG4OX01hmS3We Bw/L4V2rsJaJHHhCKo+CmJVym7OhOcYTO3B9S1wZb3F3VfeijtOMcU50AJy1ILGpSaFO SP333YcgGL9W86a2v9z0NBd81EOuIrgB9cuFdaINB8mbDCdtqRzXMsn+GLNpXz7mQqJT O7kb8gkc+Ja/H8v4253cFzZYfMZozOmdS5jXjE642z9RV4Kkx+RrzabcwwLkP0tN1nwa +sIjMVFVnM5v8B+wsJ8WFPTTaiSDOV/6Hm3DL6vZEsm9XZ0833VRxMik/1X1IZj++jd9 rYaQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f21si862214ljg.6.2021.03.17.07.52.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:52:50 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaA032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:52:50 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v3 01/11] start_vm.py: Fix target name handling Date: Wed, 17 Mar 2021 17:52:15 +0300 Message-Id: <20210317145225.88050-2-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491237239334662?= X-GMAIL-MSGID: =?utf-8?q?1694491237239334662?= From: Roman Pletnev This patch fix bb_output search (issue with wrong arch name being selected for qemu) which caused qemu-system-riscv64 to be used for all the targets: >ERROR: [Errno 2] No such file or directory: u'qemu-system-riscv64' (1.05 s) Signed-off-by: Roman Pletnev Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index a3e32ac..c10db67 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -17,7 +17,7 @@ def get_bitbake_env(arch, distro): def get_bitbake_var(output, var): ret = '' for line in output.splitlines(): - if line.startswith(var): + if line.startswith(var + '='): ret = line.split('"')[1] return ret From patchwork Wed Mar 17 04:52:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 364 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645647oor; Wed, 17 Mar 2021 07:53:01 -0700 (PDT) X-Received: by 2002:a2e:a318:: with SMTP id l24mr2648941lje.399.1615992781050; Wed, 17 Mar 2021 07:53:01 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992781; cv=pass; d=google.com; s=arc-20160816; b=WtKEsgyNiJqUUojrukvmNJxq8/Aqy/HvtLdBE4VAsRN2xPW48YZqyhn1CKeJ3AxP2G IlH/GUE2n0/gxBhMrkfsiLWrEZfl/J9/WweCoisj9GC1WZW23ZrXqY26OADPcL+A6iz1 yLqAF9H7CaO1cVFfXgyXh4kK6Q0eLBkc/QCuwqro4QBS7ylsM10tcfnPuPGAyvMz5EQq B23QmaTyrwckcI40AB7VkcC0QoDVo9p6uyncQM20dUOjh3OFA/EhbiaTvu7HpcxnWPXj YIjJS3WtmsFARAHcSaFtCDE2bFewiuqhBdEfuBAaIxv3qzWnFuNaHZFQ7KWo1Xg9iFjV Q/Hw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=m2l1JZyiq+VXlCOhvjyCkUdFO/cvlczPiYAH4u6etMe40ULxN4bmuF13kYO2nwCcPP SBncimK6YQqgzUR4ALCuw5yI1dCjrUfuEHNGBvu0aNsS+dfmKwSG7RpWAAjYp7uxJIPm 2GCB/iz8oh5cRvXmycpgUEuebltWbPe3byQAhTOaPXm/HSogNnBdGYmhm25eg6o+RuD2 qiDPridRGpGCx0Z6+0AN6ZOymVWW4sfnsTp5ileX5Qe/RmvWnsOlgwlvbWMk/AMf3Vuk yT9uMNqbpoKkaAKN+SnKvsDIuFfIIZQVZsCGErIsTTnvw0kgpduKWHvm2Cn55QK/rlc+ 4oQw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dEIDGGYH; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbtfpzcbamgqet4afqja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBTFPZCBAMGQET4AFQJA@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id x24sor9560675ljj.17.2021.03.17.07.53.00 (Google Transport Security); Wed, 17 Mar 2021 07:53:01 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbtfpzcbamgqet4afqja@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=dEIDGGYH; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbtfpzcbamgqet4afqja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBTFPZCBAMGQET4AFQJA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992780; cv=pass; d=google.com; s=arc-20160816; b=YMlBSQ/FeHHXfuiMCq2OpH+arTo9ns4YimrLd8VmNahc0qEu9G6Ow7Najm8nJn2rab A5Pro0fQKRVcd5aJY7t9tJml3evzi+Cts+2FT4oNCpHcJBtA1P3BuocfSL2Sm7FeY4c0 qBEqiCp6z/ywdL7yRrVGAj7OSL7VxDlCrIEHKk5Gscv9Nmio1eUto2gyixLYuDNuxiHS rkLNap5ZFjSTfKS56gE251e9JdcaOYM8Duf9qZCAKovFLDA7qWgsdWk80N+bPV9c0DPV 0E3w6g/C7bpdqlC/VqN5H2vFTr8ZCszMN5OflVXLDUxK397JbfPKRpmNcpUUUWQ12VYk 0N/A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=mXSlKdUhL/yK64Fp6lFmPS0d1KexYC2HZ7wNfch7QjjxW1U3zA7Ip6QZihWrCD/Lry ewpbStqS92LW3PXhbeX7IKVCK5zrgWJh0FjChgwApLGRTcif7vgz6VyyWRcjcjM8NXWM v5bfgRReAC54FhXeJ2ltkujrNj4YNV50DOG5eZ1X1jNpeepSzsaqH8Co2dAhmVPBLfr1 aaZu540OBSumFfhlJWIt4An9wUk8lOojSKRcy9aMPC6dbrjDfAHNogfemM9Rv86sVh0/ TAKHpVNwJjjpGJudQIEP/ThFF8GMraKUsDdRFx5PNyEC+fKnfWR2g+qexy1rrACYPkOz bxog== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=dEIDGGYHul1QpPORQGXcK+tCJ3DHXqXBdV9olmNDGEmKr4v3tqf8czqFdWhVfTPBxL 4snhk82hF7xzKA9vqGypKWohq3cFTtdI0F+wB6wYvfreZjHxnDGEMxxv/5DzPBFYX5md VyTnsI0SWVeDRAaI/JURZpLYHV3LcNe9DKUFBAm/1KTyzK+JKkfLvY5YRPtea84D7fG+ sNEmGVzLGGuyQqaful1PzfM3C+6h8kTmN9uvQ4uv79WGqYhu3sfb0VP+T1ytF1xtWRIq jVr030vB/kmXrzAJuYFMWdya4NDQJ5aGffNWYrRMIip/014usEN3nQ+NPncKwM5yjdvr pLqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Li0rVnZlGij2ioW7E8DnmpYWxSXAHLmOwzT5/dWpM7g=; b=WJ2PSncNMeOMx1broHedwMDY5Ps01nn3uFyZavYsfHEPxJYa49RpzKUYa+Kc6wl7sf HFpialZz3apqUb/6L3fqj6MBNrel9zEzqe5SZ2usyH/mA/pa8C/LMvAg3PmaEe1OOyzg vJPNtl3s5G9hdwnfqhdIUWxAAQPdvbmvsvjIYztS6g3xNsvmpCLi4Rkcmng7gYFkgMcG FQW0Yj2UtLEPhBObRAa94V/Y0+YgEMSawU83x7Pm3pUDKOEOJ+by50otB4iYp5yheA5m 4MQ9lLMa/0KyHRQqF7P/sDfWUz67UJYzcJacePFLIL47gMofPYP8Sv5zPAOGJ7paG/Cm DANw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531jN8vbpI8ML87rIZbBIh5c3uhi0kbCwvvM8U0nzLGhWbyn+1QQ 9o3nLASwaQpaIpUGU0KzdsE= X-Google-Smtp-Source: ABdhPJw6ialNJoI+aDzNY11E/xwgKw4uSiXzyCrXa0Pz757v5RBY23rp5oeJjQQeIDLVQ/6H06a1Sg== X-Received: by 2002:a2e:9a98:: with SMTP id p24mr2686846lji.86.1615992780711; Wed, 17 Mar 2021 07:53:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:ace:: with SMTP id n14ls4779604lfu.2.gmail; Wed, 17 Mar 2021 07:52:59 -0700 (PDT) X-Received: by 2002:a05:6512:370f:: with SMTP id z15mr2607696lfr.562.1615992779815; Wed, 17 Mar 2021 07:52:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992779; cv=none; d=google.com; s=arc-20160816; b=FdRrwgmwIZzEszqmCOQ8h4BkJHF/VTlMOVajfgrxHdJ6t9WlhVR3zoPhbFbwFcahfp UPUvrPW/AYXAq6Y/OubeZGS/atZY8pncAF3gfxuL19axU/r9mbmoADtr7lYypRr913qF nTH4xAagA/Oxvx46UR3Q3cFX97Zpv6QYal7vNdtoi9Zg/LpVkkZ0ElrRKsU33NyIWZ2I y6qULesqJUC1M9Q64bU3JZzI+TWa78prstOxkdSlNJr/Rphpqobtw3X6RE7v516ebXJr adS+/ok4OEEAz32328JEHHwmoC0JLOt5ioaW9gVf8GOKvFAa7rVAMHpipov7lr652XZA uZIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=jh/Dm8QsiR2TU1/f/Eq9Tak4PBh4yRtzBSQv1oGDqC0=; b=h9wVnmLCgOwQMa3IpnW+2KHyq1Cmc9aOEtnKSlE9DP4VNUMjFP3brjOj0SgbbJjl1B DkpooP37ZSApLKAMqI3QeBlLqa/8oEgdYML0vdfpyuVywE/lFWvyjbkzVAUlTkbPP0Rl nfg0tK7ihwIyv0vzVhu37qdiQyiGjxaz3I1CIa6oOQ24XanHRzxdyqB9Z6YiGK260lTh VVx5xAZynReXq19fHAn3UZF7KUphxkzA2EzAhJcZb6Li4A1vbVCdEqF8QDPhaboi9x5H MF8epv4UkfiE7/GhmAxXXdeH3k4kWOl7Ke3nVh2hPtAci0cAKT6lTkAk7T1EnlS6fHBA 6BnQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o10si991164lfg.12.2021.03.17.07.52.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:52:59 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaB032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:52:58 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v3 02/11] start_vm.py: Add output and PID file vm_start.py options Date: Wed, 17 Mar 2021 17:52:16 +0300 Message-Id: <20210317145225.88050-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491246499036680?= X-GMAIL-MSGID: =?utf-8?q?1694491246499036680?= From: Roman Pletnev This patch adds options -o (output file) and -p (pid file). Signed-off-by: Roman Pletnev Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 16 ++++++++++++---- testsuite/vm_boot_test/vm_boot_test.py | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index c10db67..0abb9d5 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -21,7 +21,7 @@ def get_bitbake_var(output, var): ret = line.split('"')[1] return ret -def format_qemu_cmdline(arch, build, distro): +def format_qemu_cmdline(arch, build, distro, out, pid): bb_output = get_bitbake_env(arch, distro).decode() rootfs_image = '' @@ -57,6 +57,11 @@ def format_qemu_cmdline(arch, build, distro): qemu_cpu = get_bitbake_var(bb_output, 'QEMU_CPU') qemu_disk_args = get_bitbake_var(bb_output, 'QEMU_DISK_ARGS') + if out: + extra_args.extend(['-serial', out]) + if pid: + extra_args.extend(['-pidfile', pid]) + qemu_disk_args = qemu_disk_args.replace('##ROOTFS_IMAGE##', deploy_dir_image + '/' + rootfs_image).split() cmd = ['qemu-system-' + qemu_arch, '-m', '1024M'] @@ -72,10 +77,11 @@ def format_qemu_cmdline(arch, build, distro): return cmd -def start_qemu(arch, build, distro): - cmdline = format_qemu_cmdline(arch, build, distro) +def start_qemu(arch, build, distro, out, pid): + cmdline = format_qemu_cmdline(arch, build, distro, out, pid) cmdline.insert(1, '-nographic') + print(cmdline) p1 = subprocess.call(cmdline) if __name__ == "__main__": @@ -83,6 +89,8 @@ if __name__ == "__main__": parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386'], help='set isar machine architecture.', default='arm') parser.add_argument('-b', '--build', help='set path to build directory.', default=os.getcwd()) parser.add_argument('-d', '--distro', choices=['jessie', 'stretch'], help='set isar Debian distribution.', default='stretch') + parser.add_argument('-o', '--out', help='Route QEMU console output to specified file.') + parser.add_argument('-p', '--pid', help='Store QEMU pid to specified file.') args = parser.parse_args() - start_qemu(args.arch, args.build, args.distro) + start_qemu(args.arch, args.build, args.distro, args.out, args.pid) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index d4849c7..f1b7b1f 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -30,7 +30,8 @@ class VmBootTest(Test): if os.path.exists(output_file): os.remove(output_file) - cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro) + cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro, + None, None) cmdline.insert(1, '-nographic') cmdline.append('-serial') cmdline.append('file:' + output_file) From patchwork Wed Mar 17 04:52:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 365 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645705oor; Wed, 17 Mar 2021 07:53:05 -0700 (PDT) X-Received: by 2002:a1c:f605:: with SMTP id w5mr3985851wmc.66.1615992784875; Wed, 17 Mar 2021 07:53:04 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992784; cv=pass; d=google.com; s=arc-20160816; b=bvaoz4qj+LjjXppc5T9ZXMUEflS30dJP2kbZ/V1Q0itSutJHRcmLP++hH5dG+QAB9a y7eZJcS3U8ShEUF2LP4kOHGh54WORcL/aRseILwc+03dqta75q5RQps08O9p3x8il8KT QyGkg4LLDr0sthSykfO5fXdgnIMNLPVKW3MelhL+YJ6saF24UBsah7WRa1ZTxqkt4ZSj KlLY7kAClJhkogPXnB8NadtQ6pBFXlbZOLrGdn9YhL8cqi4RGG1GlvzFqSpBRuklqzOP sRtQtdWinh4b6AFh/Z9vndPJ3/umnDYLoqmXEVxG8hxmR92f1FVzxfLFjbDADacfiHZH 4VuQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=qomFalal0PB0H9db9ARyiElcb7X6A9n5PY+TFQfPmsQ=; b=UT9xrIFJHjsgDtvFUrDv6gmz3Rd9MfUDuKNJ4kevqTMa2KvvDoa0e8T7OOWniVsbCl 13HYAxmzVU3tlLcIlKV+jKprLocpxK7MpSGPXlKWcRE07dAU14mFaBbc+mfMXmYqhn6M lO9oUxXjRo7jiKpe8ohbmiDIn/OFXRWEtTm5NyBq9H5GSLAYF1WnCc+mxmiVf7/eajr5 TJ99EVwbrbXgqOFj2BQeLAM+5pm8nBPE6ABCxYgybcFaZiBBlVdWxzy5eAcTj663qaQd kZDY0fHLNEQuTlY0CflXcrNKJ0BJ0WrHhGheyTDHqWG5FMzfqAspCeYaWOfEsMVdrLCk 7Psg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=fKfmhFJq; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbufpzcbamgqe56i735a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBUFPZCBAMGQE56I735A@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id t15sor1575948wmq.20.2021.03.17.07.53.04 (Google Transport Security); Wed, 17 Mar 2021 07:53:04 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbufpzcbamgqe56i735a@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=fKfmhFJq; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbufpzcbamgqe56i735a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBUFPZCBAMGQE56I735A@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992784; cv=pass; d=google.com; s=arc-20160816; b=vlhZEKVWrBTR4K5dK3gqu2wiLnmAPPBavgLQCVtLNDMJdhlyEnwOZUiyd/dKpMVCL8 YYR1ifWiwTCdRZuA2oDGI8zB/SAfaA9S/lv0z6anKkBPiaxTiW12fl4x+3qo6W3+fHd3 Ojj/bJEkDw6/AfCJxUf5PjUrp1PrzKuE8Gjm5x+dR641qQaDcrB+C4HpcfqCFdzAKFVo xhAKQy6bFehoY8EW3dPeZnmiJUYDce3e3l1+73Hn5QcsKDKRWZgPXekfxQQDngKfpyTB 6zfeOuUT6XhW2/3Bzgl7IeykyYoInhtUr2AIMrpkgp+zt/Sfk+jAn5WSvC8+i7K4vRwR J2QA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=qomFalal0PB0H9db9ARyiElcb7X6A9n5PY+TFQfPmsQ=; b=Bo8I+9MejKDJYUOMoOq9HvaHYc7oCTql+VNURea/tB929+PXEvv3uOaEaLES6XItdi MWFcuv/0fdrYlqbucztmLJLUjF3OaUlf6/SaAytzlrx9qfDg/+cch+U9GfRVlyfCVwbX CMGKofqFiwV7FjWpkGIphEX9JD5iUkqWQvhZINDMM0km8S/9Sp8NJyy4z9ZXlmLrE857 zRon5eZwqDdcy+R60dhTVJLjUdYVuvvgjDVcnHrNtWS565H4RAUFdhQ7Gz62PiYrZitp lVw3PaMqZl++Vv/XMiUSpi5MTzc38hTrInHJzyg5obWi3Ct+BBTDZNztujKTBnXxlgPR siQw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=qomFalal0PB0H9db9ARyiElcb7X6A9n5PY+TFQfPmsQ=; b=fKfmhFJq9PBDthBZhtyBXvVTM8LOMEaFYPsPmJR3gIx6dkGJcP0DySmGrJcXM3BwEM eqziJqmt33oGJO07HaELvqhlUXTyppdFnRW6y5Ym0zlW4lrOtNug7P/YBPRhoKP/xg7g s5WHgUJyvv2UtgxcRPtZF12ebVqNSFwIKxrCRrstxUVfOw+fIA6DrBJH+j1aszptzL9T EbMzvmRvUZWBUTGmhwHM3+wPLMTZ2DHx/I0a5SNRlL2RxJ/EiHctM+0oanYumdKB6zMN faQpOgmztRtXt0tajCLqVzI1HcDQAoi9+DNxEOtaMryf7F7E+1qm1Hh8U1UMX6a56UCT Vy4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=qomFalal0PB0H9db9ARyiElcb7X6A9n5PY+TFQfPmsQ=; b=AT1IBSzz+vHeLf0u8Q3bve+N/XkzYKlrUrOmG7LYb9deqFPc02vegeuln3AGIk1BIp 3ws5h/ut8gkgGM16flUTPPCfmDowjZFsCqEReW7SaXUUDSX4rp7t2ujQbLD3kh8QqIqk WuXhJhW0ccM5aarJXM363d6wSKXS8agXdh29pMgMRtv/3OoHjkrSdCqB3lgJIgYnGbV0 XSC36/viwzTysxMg4V6CfGP1Jg8R1+XqOX11XNhrV9Wcaccloh14xffhQK7/raxFZNOi NC9I5mhdFCfP8v2BVdu3G5KcQIohod2jzvIQPQj1b1IPrycHRcEPdA49BhUyTAlTmNs0 LIgw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5325vqszbpnNohW4yA8Kri3gEs2TPdWQCYihFDqulrf3BnYAgwrx Pc2s/QJiXyYYTDB979QppqY= X-Google-Smtp-Source: ABdhPJz2uFQzDmXKY0Qf9fLZOePg4QNkO9ckpcQvJhZJgcVpUprYKbmRtDEb6nBcXvDoEPDrPWJMYw== X-Received: by 2002:a1c:bb0b:: with SMTP id l11mr4195780wmf.150.1615992784199; Wed, 17 Mar 2021 07:53:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4f8f:: with SMTP id n15ls1002436wmq.2.gmail; Wed, 17 Mar 2021 07:53:03 -0700 (PDT) X-Received: by 2002:a7b:c5c7:: with SMTP id n7mr4121298wmk.30.1615992783371; Wed, 17 Mar 2021 07:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992783; cv=none; d=google.com; s=arc-20160816; b=DVWn0skurG8wFaHkfc6o1lzWz3QTlWpI4GwJrCS/5RdXa32hF8JLzV/V2En2nn02jc JR4jlFzuUqA/25Ql6XisgyrSRK9d9U9rvYfxlsUg/EF0vyauXfZA/65lPmyidqtr4MCO CGihEQJvdGNgSq6SMuoTvJyyoaX+8glnguGsQ5+92a8hWnT3zFGfj3eoZNzXJ05W1h+M kPOcLK5095iqAm5JXjFrh7NInYrdUQ/02MVMHMPLDxPeLf/PSB4Og+ITn85iKtRDH8Dl G3jyikdpmit6TGffddf7V3YEYfIn/z7F5MMvCQJ57/MAQRNf8nGhxqJyst7PNBxbsXP7 eiWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=ig2/jhRiTk4S8ghNFxHDwCxZbDrvE0vO2nwNCXqCmBg=; b=rH3T1pZKZ9f3wsk6aq6+Md7NDqCv0crixMbiDmLYUeOY7KA1sOA8xyjW0BOknSyVeB obx8/9L2WOmftXD6SNSx9ZodIy8U0QZreEmjO+TYDVlVKbxT4bu6VWDdB6zmNhF1JHoA eAS1aa8zccuvuTekjmglpXGB/z2kHj4LHJUOaG1IzQLH/CBnOAMY8WxMjq205dDmi0t2 TMESbegmw7PoqSGogsivQVulJeMXUziKr+PJdwmagdCVP2v+Hd2gbuoZHHZ/u7g/y9JV EgEb5XTvmGvyFQaFopvX7q2z9j0KlMHZ/Z5xvBv7zdLXYtJC/V7YR0T7TcuQkMKQtl0w jSfg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b6si129919wmc.2.2021.03.17.07.53.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:03 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaC032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:02 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Roman Pletnev , Anton Mikanovich Subject: [PATCH v3 03/11] start_vm.py: Add MIPS support Date: Wed, 17 Mar 2021 17:52:17 +0300 Message-Id: <20210317145225.88050-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491250253784796?= X-GMAIL-MSGID: =?utf-8?q?1694491250253784796?= From: Roman Pletnev This patch adds mipsel to the list of supported architectures. Signed-off-by: Roman Pletnev Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 0abb9d5..dce140e 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -86,7 +86,7 @@ def start_qemu(arch, build, distro, out, pid): if __name__ == "__main__": parser = argparse.ArgumentParser() - parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386'], help='set isar machine architecture.', default='arm') + parser.add_argument('-a', '--arch', choices=['arm', 'arm64', 'amd64', 'i386', 'mipsel'], help='set isar machine architecture.', default='arm') parser.add_argument('-b', '--build', help='set path to build directory.', default=os.getcwd()) parser.add_argument('-d', '--distro', choices=['jessie', 'stretch'], help='set isar Debian distribution.', default='stretch') parser.add_argument('-o', '--out', help='Route QEMU console output to specified file.') From patchwork Wed Mar 17 04:52:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 366 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645745oor; Wed, 17 Mar 2021 07:53:08 -0700 (PDT) X-Received: by 2002:ac2:465c:: with SMTP id s28mr2585799lfo.135.1615992788005; Wed, 17 Mar 2021 07:53:08 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992788; cv=pass; d=google.com; s=arc-20160816; b=INRIyDuHF52Nwa0PJOjB9+GJmc2OgSIznBEuwMLdvdy46f+DyUZtVf9savnFskC2fx 744f+RJeMraYpbbliXCYtOWlXsAB+45YX039kjDgud5ej/yZYlhivkd3AXsmqr3Iq2Yc WbHSD7TUaSqI+UscYxi8W9y2QgWx+dqRv41ARXDgIUcDAahRcFAV9f5HkQSIRbVkVPc/ P68H4gs006FxCghgMNEBc0Rr+AKxir4ICXnuANz6GE0hW9QlhfIFyX7chpDOmdjvP6Zp gVVJ93lm74rEdXdcqzEA/P1y7E890agBaBr62foFkyX3uMFolbEJJNZuCdh/IKLgkPnY 3PJQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=uPo9YevTcr2FjH53inU+D/NZ5fejEhtHjSanTZDhjS4=; b=j6OoYO1V+fZjMAyv9mNFlZMcJYJJWyLYftSSHEANjtdVjG0F8duOcPJcOHgLksFlh1 LgWcQ0fGYREoGlgM4U1roZYj9fhYJY0ob0lke1rzXJ8RwlV1MF56urbPZDDI1E4TOUHI 9AcC1/RaVlWKuO4m5FfdkoxvcB/p88Gu1ATy/mYzm/QRclBhZntWW99FAQWrxsrgsF3P LI5lbaOHTUW2TZ1UTBEHhvcHDQXmx3sJewUd37zkNAHmpwGbtm93AaQCmBoHk+F9TaPm mJtweTwkrCQPbnjrnvAg9oRYJ8EUdWg2+RQ4rwO4wGpW/8gUVOhyZsRy8B29HdM2xkDn HbqA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=e58HMxlX; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbuvpzcbamgqehseerji@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBUVPZCBAMGQEHSEERJI@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id m27sor4006397ljc.21.2021.03.17.07.53.07 (Google Transport Security); Wed, 17 Mar 2021 07:53:07 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbuvpzcbamgqehseerji@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=e58HMxlX; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbuvpzcbamgqehseerji@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBUVPZCBAMGQEHSEERJI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992787; cv=pass; d=google.com; s=arc-20160816; b=rU4eOmU8dGlBlAQtOZj8yEpPnwR24hLqKD3u+VDtTbiEvPr7GP3HZ/nkyBBD/Zclvn eScpftp+//ljYW4xU4kRIE/FFsH+CshY6lGcWwoBG6yzb/76ARGz6U1CTQJwbN2VOuiJ iwRzCNaPZvfNJ5kJA4dgrh17QlK8Y7hsS5RSuOFBlW/b/UVRnDqLLa1LMCKFzDpCmzPQ SlpISS1lTWeoDM2jmWULzmNUAJ/yAeykuASB7otolC+peWZbVZH2zvBDqFqguH+bVkU5 4INv9uZ4bG1ewUS4FHfj61pwX3bpEF9CX/5yxXVCg0csmVNy1KWoRCC650r/4frc7zuc q6Vw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=uPo9YevTcr2FjH53inU+D/NZ5fejEhtHjSanTZDhjS4=; b=AY6PMeI54HqFH+9nBiNcaMxwUmlrEf+lIbOJ2Bv9LZyLb4gxNhimR7Z0uVM65Xz7es mzHeMiKCQ2Bi/ReaHZKaG0SSkfrFJc1xxmfRXbsU1cChLfPhB9UiVt6mw04xckEq21cH RVG8Y6Cwi5dI/jpPtaYeKzJBrbFQ3nrydDxROuB3Q26Xq4tC8fuFtp90dfD4SehkicEH R+HnPp0viLQ0yeQd4VIRxG6o6Ie2vz+5hpe83unq30NR0OGKU1zvxjz7/i3N6DUJmdp4 ivNceZaDXqLWh4sTPDRk5ETnXYvZPuvYr/5esxRfCdAce0IQOuPV4hPhAATSUpFCwPdT z7LQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=uPo9YevTcr2FjH53inU+D/NZ5fejEhtHjSanTZDhjS4=; b=e58HMxlXCeBcFt4WsRxEBpJNR5V9Z/+nR3gQdtVg3VdL7I+nEJpauwQKcIgivbh480 YWJrXkHTKZiYVBtDagDQNUQiDClrOv9JkjxXC8i9Yz/FVjaPlUDOC0CwwUdRHu2S8Lkg kjBL3qN5oZ+8s9wMaEouU8j9RDiY7i8PgU30HFHNf4QWHUYtlSJzTgl0iWwhTkpSTvK0 96g4ZXyhJLhTyvEU4Qlmviiko3IE0xnTaK7lWYVHx8YOgSh54R5b4lVQ5kWA9tQ7t7ZS z2utI4ndFdkpc0kskq8BHkQqPEd3Dd7yI6ok2Jp9X5XTROOxTsAp5b6liPYSJY7C3zhR K9bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=uPo9YevTcr2FjH53inU+D/NZ5fejEhtHjSanTZDhjS4=; b=G8fqWc7JB/c7qKHP866Kf9+AYDyeuTi5YwcN2XZP8hCFLDtw9yV1oZgD5TSiPaYyCn OC9RnQ9kxnB/DzKtMn/P7ANBiz1QiUOJFbs+9d5FcZKfJlBvzQnNnbfi9SDbhs9WZf/g HT85F99UrdPmpXrbrVi2hdipillEc7NdxIS+E/Mokrz906nXuz8sxnB1vBhxv/nJIgS8 TOlAmyhP9eT5e/2mmF9Szv5HKwlnetb4ofeWapdHRDCna6DoX/ajFk99flxYpajfjOEG R4bmhibzDmcJzhmp6Z+E9RbBFtK+K4PEn8aVQ5t5yQye5mlykbdz013PBBD9PsBawCz9 zQvw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530oib14fhBx0dMYGT+Lu2F1xrVT7IWN8nlrFelxuIMBnO4iK+85 a+JxKNMzahXZp6px7OPs4no= X-Google-Smtp-Source: ABdhPJxDH2CQY2nMgq7+KNuVfdnNyGAbWZDyG+Pl7aNTKo0qfaH8QEydZl439yEqYB5VKkOhR4rWkw== X-Received: by 2002:a2e:94cc:: with SMTP id r12mr2605850ljh.373.1615992787150; Wed, 17 Mar 2021 07:53:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3993:: with SMTP id j19ls6960237lfu.3.gmail; Wed, 17 Mar 2021 07:53:06 -0700 (PDT) X-Received: by 2002:a05:6512:b19:: with SMTP id w25mr2411669lfu.576.1615992786060; Wed, 17 Mar 2021 07:53:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992786; cv=none; d=google.com; s=arc-20160816; b=aawSTx2e1LO9geH7SynMK+cqaHBJEAoC8tsf/KuAdC+lcYjLAToAs8TGNXQDQT9NGf AEhFqZkiqAsNRZvFf7wUWigqmcP3ci5prWo7H5EnCc/VaC+DPZGMix0BnPUaQVGo9eBl oNbvZat+6q8DCYhhW9QshasVkBqEv4MKNZBfyOiaYm6I/augGw7dDQrqiOYHHEJZkW+C rrfn9ouPBOu5VoQw1HYhWNZ5OPPTJ+R4Pf+9GKyKjevJkwW8et2UpsRiwvISGtL/ZNWz M/kS4J2S0DS5AHFWrBl4LoFYd8GZOTYWVel0UTLcWPonzRJcQ0MzPfmf8ERCRbnR4mLN tNpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=oI0Vf60dedg9GSJvh0o4+2Q0Q4p6/64Zg3NegkbCd3U=; b=Rz+hyufrEpqhByPEVP78iowHuQx0/1WMDohG5X+9SlkNv3QOeZdFa+tl6RRj1mRuqM RUNpbdo1rYW9bGeuBv1765mmIlibk4mwR0IKmzypiE/Jd/FQkFSu7zFhVRCVzL1YG3uz HM3bolGn2kdMA0HklUEur51YQqrnk2xr35beuLK6mCWhJbeE6cHuiLP4FPEWamzNM47M HXDqdL9eYRXn1iVtJCC0PaYXbZTbiz/rPbLhMpci01hMpbzxHVzEwSVxgK+0J+hsYZgC gG0eWG+XEzyBAVv7DXhiQHpXOsY5lmWoHlGGm+mCJ8F1tR592yhFM8dVjzujFq39rtH3 MSXQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id q26si803358ljj.4.2021.03.17.07.53.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:06 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaD032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:05 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 04/11] vm_boot_test: Fix log file path in vm_boot_test Date: Wed, 17 Mar 2021 17:52:18 +0300 Message-Id: <20210317145225.88050-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491253737103041?= X-GMAIL-MSGID: =?utf-8?q?1694491253737103041?= Make log filename random and store it in build folder. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/vm_boot_test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index f1b7b1f..c937a16 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -4,6 +4,7 @@ import os import subprocess32 import sys import time +import tempfile from os.path import dirname sys.path.append(dirname(__file__) + '/..') @@ -26,9 +27,9 @@ class VmBootTest(Test): self.log.info('Isar build folder is: ' + build_dir) self.log.info('===================================================') - output_file = '/tmp/vm_boot_test.log' - if os.path.exists(output_file): - os.remove(output_file) + fd, output_file = tempfile.mkstemp(suffix='_log.txt', + prefix='vm_start_' + distro + '_' + + arch + '_', dir=build_dir, text=True) cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro, None, None) From patchwork Wed Mar 17 04:52:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 367 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645758oor; Wed, 17 Mar 2021 07:53:09 -0700 (PDT) X-Received: by 2002:a17:907:75c2:: with SMTP id jl2mr36241575ejc.334.1615992789120; Wed, 17 Mar 2021 07:53:09 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992789; cv=pass; d=google.com; s=arc-20160816; b=mfhxc2kyPXo2qQ/KFQofyvrsp1a8mHvgt4BDCkGd7nmpDC3LY+02fgQ6g2rz3+21uH kcK7Mg/x+vys7B1R1gtx9Kh+FWWGq+5SDz14y7iqK7iN2deVFu2FHi2HsRm5thCTLpTH /K/AytnIt5Fn33gXNCcKmLe73vPyi+3u+Qg0mBU1sXEIaDVjCS2EfoNuJ79S1N/kylLS BSUzDUw8xnnhvs1NWWdQOKaxRL/WHedTnES7gYTZB6ZUUbLTwoMTjFTacPxO5Udd6g6x NU4mq1waVCKWty6JLiUoJ4SfJHuKlZYO9NqkBvGpGnHWWHHt4CQbMtdnfe5Y5rGjZYtW 9mvQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=u/I02VaDxDDwBdh8bTGb3V2A7mIkA7TriB6CAcHdi/s=; b=RRhhHbv5IU/PD8ofUWysnOGGGtK3dbzo6CX7QDVtzSt9Jh+1jmzdt6THJmxUaPJXUV +OMy3VzKqu7LxGNVoF4tAHbVcsj/h8wxAF0eIdk6BK92/j0WFSy/fKqaWf5+wLUlWFTk kegR5/WpDJUYixKheP/ziBoHJFhz+quUvJOlVrqVxNkNrpqwdPQGDVJ8dqMJ9L99oeJh ZcuUaDZXGMebNoBvigDabGyC2kBO6cY9SuUwEpPAsl9w/pKeZMXwELAwlKmE+I86unmQ wF/bBgP569kSlOrRXsWYAlknS2C+LGL0h/fmE/+gcpUK/x1mYEXOPebRwYJui9ZLUDkp zByQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=tE7GI953; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbvfpzcbamgqena6gvuq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBVFPZCBAMGQENA6GVUQ@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id fx19sor13028055ejb.81.2021.03.17.07.53.08 (Google Transport Security); Wed, 17 Mar 2021 07:53:09 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbvfpzcbamgqena6gvuq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=tE7GI953; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbvfpzcbamgqena6gvuq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBVFPZCBAMGQENA6GVUQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992788; cv=pass; d=google.com; s=arc-20160816; b=dIKK70Paztc7QkAiLAzvuyEtlt1fcdYaVYADFiPTqymR7Y9QdckFUAu+jd+JgSM83K UhI7wzd+T6DvFiVHPiUT4QZ9N2HVK20OhyTMehLjgLievIVUTnTxzxcbn/zn/R9IYnu0 kcLMovl3MR8qFC8WgWen3puBAbY+Y1ZCVtbMeK5MG8qXopC83lgT68IppfNomaE5qbT5 7lJO3YGuwASDH2jWQia9MSIIylnKGUrt/8J5LtUH2GeV4bEEDNpkkruxbFOUjcWzoJ+f abksYhuzI1xTPzYaLX3rrBgdz1oU1LtAqhb0hZHbsU03+4Q1+qXceczr6x2uC6pgGc41 wywA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=u/I02VaDxDDwBdh8bTGb3V2A7mIkA7TriB6CAcHdi/s=; b=wQPCgyduLG7ou0YZh9mEKvqERJFHOc8H/h1zUG2YjC55B4NfGByETh3S8GZ+MA8spq ZSXi2nEAEY8pEku+wV2D2q6x1MmvkhKAmPwg2xkw+CDYg6goERamVoXo7t4hhnUMNVFV XZQi4Y83K4KYS0IUrhGWxjEhsNEjdQCbFoC9O4o33nnohNtmsN6RIS7kyS6E5ugtwubI ytE9Khbi2PZc2LKnvhzDCz+uPNj5H5xAxL141H4CcLzHnP6+SQ45w6P+4ug4ts1oemiO 5fdTD8ghS7hdSTJvilWxMheMMfWSMI702HTEl4xeJERgYKIyS5virvw+IxND+z2QIe3+ tD+A== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=u/I02VaDxDDwBdh8bTGb3V2A7mIkA7TriB6CAcHdi/s=; b=tE7GI953S8Yf7SM4bhA3WtCgo1oz+ulSeUIlIhKpjnUY7bSXHOWHr0jh97U9X6ox2L Q2RXe2RsADIzwP9+N4XH8pfs6mllp9WylNT35NYl6n/o5DeZGLxGTsjT0XlcWtNTU7Qn JWqnJYNIbRhPs7C6dx6UkDBGEa0hTDsumt/VShHE538sOL5fu5IxuQ5K9IKlvxm1PSaa dBiCKA7IRMFlfFNfi3XodhtHQeaSJaiqsbT0X7T4Nx24SjA06cJ3I0ei9qqPP6fRqmk0 oBPnHlgLe3pFsjbLBHgn8iWmSqmD3amyGexXmMdF8HOoBsnmU1yDrnhy1/eeJXheFR/Z Mw6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=u/I02VaDxDDwBdh8bTGb3V2A7mIkA7TriB6CAcHdi/s=; b=SP7KKcawiizOzR+nkg3fTsMCnMr795+zqTRAMEs948bZRHo6hChGygXkA1NpfON9FQ W2NYAp7QBAYNtiqV2YdD8iiLec4BRLIJPY9+FTvutC3HO8qs+mG5wG8BEvHxW2dCH/R5 4EvPd8nPMt/ljd9xQvEWHmv8JVM+JgF/ef4rG/G8RJtvP42n4LDJAFSoAgHzOTWGBa3W br1MY5ydSosd7TSMIvjMp2XapdmHiHIO11vPstGd3ivRIW5rKSCztKs7ewqXMRjptsNU BmB1nwmD2ytKBFkvBeIPKulT4joEZ2hyxN5/B28Sij7pewY/AzXtZNjG/jYS3LolOhI5 Kt2A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532cAgjgHcy4QrG3nRc3BvbfigqhZhRU02KaoX/OIYKbMS2V/rz6 90poqzjsX1fvAYgm+ft+zgQ= X-Google-Smtp-Source: ABdhPJzp6+LnU1zLMdjfbEC4/fykkfJ/OsGcV8SlUVTFUWf2EezUYRVSxqwnt61GB5GXm98OabVjbg== X-Received: by 2002:a17:907:76c7:: with SMTP id kf7mr35111414ejc.470.1615992788723; Wed, 17 Mar 2021 07:53:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:3f15:: with SMTP id hq21ls10532090ejc.9.gmail; Wed, 17 Mar 2021 07:53:07 -0700 (PDT) X-Received: by 2002:a17:906:2786:: with SMTP id j6mr19943352ejc.157.1615992787923; Wed, 17 Mar 2021 07:53:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992787; cv=none; d=google.com; s=arc-20160816; b=qxH0KV1Y3W5vw4IkFU/qXhULS87bT3hWzPkQ5diVGyHh75HFoWaMpWDkbLn8JlSUn/ gYR03kFh1tHoJkGLJwJGpzMunXEHUKIJBNn16ZJDruZolj2ZDTle9/OJ/p162QSPcPHR algXf3OukUwzQAIo9zT0Elajulg/E7eoAEkqK6zoP+p2h+bp1Tl1WmEh3WxPApP+hkbh i6MOydgh5FrZSkeWLoSiEVYBEfUe0f1Iz6t9QrIJOUfW1bdPh1yptasE8YDwWKMu/pLl flvFqlS8k0h4hSKPLGsiMJdE75/Zw8x/TLUSwFFuAjxKa2kWhW6uk+Cr1rfUDxoCdmFq 0LKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=VtVLz+5o6T3rYQAIzigtipXpa6pNvEhvZpyLzJuKBCs=; b=p9XwF8SWn0jSlrmAKMeNzp3nll27j6HjajU0oLkLT42WgGRYHDLpIIjlSSU9kh4M6y 1rXABkHCqiut2eag2W3wZec///9XWYsOn/bkqyuf7Ibftke8WkNctfIwC6EhjFoDxjOf 7taMWftYIwbRna9d7CCUyBRaDjFQGtoqXkqV7XmiFqLme0S2wy4BR1iY/qr/SeiCibVl hVRmmQKiY1JwzOnaqxdPL0OueqmYiF7fnf34zLwD07G1E2z1QjGWKLFdS9j4hTVt/RiR naYDDleSFAja0PVtWq9K8Y1c5uct5QYtc3/9oy7ITjYwFsWZNQDjbPakzNqCA9DPkMZY 3JzA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f25si778004edx.4.2021.03.17.07.53.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:07 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaE032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:07 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 05/11] vm_boot_test: Remove external varianter Date: Wed, 17 Mar 2021 17:52:19 +0300 Message-Id: <20210317145225.88050-6-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491255191704978?= X-GMAIL-MSGID: =?utf-8?q?1694491255191704978?= To get rid of avocado-framework-plugin-varianter-yaml-to-mux pip dependency we should not use yaml-to-mux parameters. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/run.sh | 3 -- testsuite/vm_boot_test/run_fast.sh | 3 ++ testsuite/vm_boot_test/run_full.sh | 3 ++ testsuite/vm_boot_test/variant.yaml | 22 ------------- testsuite/vm_boot_test/vm_boot_test.py | 45 +++++++++++++++++++++++--- 5 files changed, 46 insertions(+), 30 deletions(-) delete mode 100755 testsuite/vm_boot_test/run.sh create mode 100755 testsuite/vm_boot_test/run_fast.sh create mode 100755 testsuite/vm_boot_test/run_full.sh delete mode 100644 testsuite/vm_boot_test/variant.yaml diff --git a/testsuite/vm_boot_test/run.sh b/testsuite/vm_boot_test/run.sh deleted file mode 100755 index 9fdda95..0000000 --- a/testsuite/vm_boot_test/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run vm_boot_test.py --mux-yaml test:variant.yaml --mux-inject build_dir:$BUILDDIR time_to_wait:300 diff --git a/testsuite/vm_boot_test/run_fast.sh b/testsuite/vm_boot_test/run_fast.sh new file mode 100755 index 0000000..0fc77b3 --- /dev/null +++ b/testsuite/vm_boot_test/run_fast.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run vm_boot_test.py -t fast -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/run_full.sh b/testsuite/vm_boot_test/run_full.sh new file mode 100755 index 0000000..a561a36 --- /dev/null +++ b/testsuite/vm_boot_test/run_full.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run vm_boot_test.py -t full -p build_dir="$BUILDDIR" -p time_to_wait=300 diff --git a/testsuite/vm_boot_test/variant.yaml b/testsuite/vm_boot_test/variant.yaml deleted file mode 100644 index 9ddc634..0000000 --- a/testsuite/vm_boot_test/variant.yaml +++ /dev/null @@ -1,22 +0,0 @@ -variants: !mux - stretch-amd64: - distro: "stretch" - arch: "amd64" - stretch-i386: - distro: "stretch" - arch: "i386" - stretch-arm: - distro: "stretch" - arch: "arm" - stretch-arm64: - distro: "stretch" - arch: "arm64" - buster-amd64: - distro: "buster" - arch: "amd64" - buster-i386: - distro: "buster" - arch: "i386" - buster-arm: - distro: "buster" - arch: "arm" diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index c937a16..73fee3e 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -13,13 +13,10 @@ import start_vm from avocado import Test -class VmBootTest(Test): +class VmBase(Test): - def test(self): - # TODO: add default values + def vm_start(self, arch='amd64', distro='buster'): build_dir = self.params.get('build_dir', default='.') - arch = self.params.get('arch', default='arm') - distro = self.params.get('distro', default='stretch') time_to_wait = self.params.get('time_to_wait', default=60) self.log.info('===================================================') @@ -51,3 +48,41 @@ class VmBootTest(Test): return self.fail('Test failed') + +class VmBootTestFast(VmBase): + + """ + Test QEMU image start (fast) + + :avocado: tags=fast,full + """ + def test_arm_stretch(self): + self.vm_start('arm','stretch') + + def test_arm_buster(self): + self.vm_start('arm','buster') + + def test_arm64_stretch(self): + self.vm_start('arm64','stretch') + + def test_amd64_stretch(self): + self.vm_start('amd64','stretch') + +class VmBootTestFull(VmBase): + + """ + Test QEMU image start (full) + + :avocado: tags=full + """ + def test_i386_stretch(self): + self.vm_start('i386','stretch') + + def test_i386_buster(self): + self.vm_start('i386','buster') + + def test_amd64_buster(self): + self.vm_start('amd64','buster') + + def test_amd64_focal(self): + self.vm_start('amd64','focal') From patchwork Wed Mar 17 04:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 368 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645790oor; Wed, 17 Mar 2021 07:53:11 -0700 (PDT) X-Received: by 2002:ac2:53a7:: with SMTP id j7mr2787612lfh.305.1615992791622; Wed, 17 Mar 2021 07:53:11 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992791; cv=pass; d=google.com; s=arc-20160816; b=AUPMBhRzyZwTY+nL3+9dSSn7AuZS9MiN6a+1jaGR9vUFvGQt3uXtcfykw0fFGsv7/h AIyFlrppoxL8h/Ud8CWeObmnS+m6wPJD/dPbWdEJ5SKvihYgxpjWuX3FqoDN6JngLAeU TAJoNKibXC0MgpQlcdSFr4Nfk7Z1uRjAwKwg8VxLG0iNbfDqWw/85IWAE3O8D4biROyS 7c2NOz2P+LBguATVZ2xvpabYevFtRcPuO7FKYdR8zSX0WUlttP1qLIEuVeTdmotPXTd+ V68RAdPffgD0dzwKd2sLsQQzpDIoNxyRuNBp9FXZIOVQZnbn8jqv9hCqrcABZeKspjdh 0I1Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=WkTrXjQQJ81D3x/vXET1prjlkjIISbItjiZJ/aau+LGsJVmAq40Xpatkir1Tk4j/hm qzdJ2f5aWrDz76JYF28x2LzuM1KbpHY4RtpSeHVh2vkqi86IKPxNy90TJ71Orxok5q6b D7729HFNdJa7xXUvhhL4efBUqAvxRve0qDNJURo4Gl8x8I8d6HPwuCLjBzrWe5XVEpWV G4TGa8/IQ+mWZHbh/J/O0idt5XryOUdB8WOK+oMJe+v3z0e6q9TGb5QxtbWWC5t/uUGc Z6Us9VXCiIghyC8mQuN3lDRmq6wWXLbTRTJQN5Rk9ybvga+UPcaHAU43ogpJaGIuSTuJ oSOg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OBVBTjV2; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbv5pzcbamgqeth6rdca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBV5PZCBAMGQETH6RDCA@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id c8sor2292884lfc.190.2021.03.17.07.53.11 (Google Transport Security); Wed, 17 Mar 2021 07:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbv5pzcbamgqeth6rdca@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OBVBTjV2; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbv5pzcbamgqeth6rdca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBV5PZCBAMGQETH6RDCA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992791; cv=pass; d=google.com; s=arc-20160816; b=gbGMshxg/TapucgqLpu/hmDL+K9LSNlqh8jgG6vDjnhUGdpA1S0KP1KI6zoodS9HOa l5l6B2NMrJHxwOLtIAghnB7oGhaCoYT8jjaXkKhn1JzefSX++Ri0lAT24NeaJqxJDLc+ Fj9PpiCuiL6ZoUF2oKrZLbnebpX4uyr9ZwoyWnfkMv4xlMLzSP1PZ/hV4agFYe4CUjt/ KvkUJlCSPkgPa2kA1SX4wgyatQhQXUr0SOhQMvXZsHgkJK2JzqlxEy8U6Iafvqu9961D kAgtSj8DVDJkqjsP+tfg30c0nRv69IiDdxRCPRxnwCVuiCkyMN6ZWmgbxJwYghzY+HtO Bphg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=MvkWIuCb7bjFFyWo9I8SMBrdSv2NesroLkmloLfa5he4xxZEvp+UzbIhVu6+XPAyHQ QEStLJilVe7qkuw6egFOtsOuEH54+8ur0ZzUBqUBD2Z69EJ1/GvxJufS/f5hVbMjc0h0 k95TAxTQ7zLuOWG3EIw5XRhtmODl7GIzrwoXvmSSKN0/ExKcpN62/GjADcR3oaaKOGOB lreaYHQB9Lkx6s8li/6RrVTFDMUNbj/U6NOCxSGl0ZTw0Bwf+K683Ou6wiQS0yxS/y08 ReaOkjoJTnghkrnYtnKqcxBSyYGXcp0vSsfJnkpb2otDI/lpwWa+ps6qvC23DsOtXKgs gmPw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=OBVBTjV2RyTBc4ndk1hL6yNmtgjf+qvmFHF4lY/gHRI+d+joZsScWsT/1zxhzdYPKh hkhM7j8iKg5R5+Bx4WoXkB1bnVqoANrnb6ZmL7FpHRBatyon/jRbGrNh7omzzb8jkVOG zsMg9+plUoaUjt2QUyM+LCumHO3DXMhibMbl2JO7qbCd/k3aKjVxH655iHPzJzqXJqPk zmRqRenzMnPxU3xzdLzKX/jg896zxR8IK/H+hzFRpCYdtrLAimypCSb3XGjtTa2498Qx mtrjKScHr2OvBfoT7xWzl0c4X6eOebPbhlR6Z+xF2yEmHkzenHUewAzNSGKouWGq6VIY /Nww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=xv6h7ObfjghRXPgz4zgVH9gQB2wNTak8yLeSjnuHCJo=; b=ie0ror8pQIGEoZHyk7ZcuQCyzstV9XgetAanKbqC2gqEIiobIrjcKM9MFvilw9MELS Rot4IdSvzEo0qoKPC2kqauCybAd6KyDPs1o6Ld5bBOA/pT0LTmfns7VJJ8dQPSXqZ2dD w03t8aMcUGj+mKqBra7j+8OS0P6SyTTAF8zCza4vzuESeY+k7shW2ECKV3ZJ3FXDTtW5 JtYOwlT/89Z3UA9ji6yInQgH0DijRFIJw8LmvlqVmAl7Vdd72ncEwkS7/a1fZVCOWjrn 8Gk8fk9wpKjhoVuQu2wCp/UO6ss5n6ta7PCMnv2yxNT98VXCZbEgrfhjb3juNRd5umsK r0/A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Agg0KI6BLGWbX46LBOvyBXNIabMtq3HnK8mJ0NxAvCCSQ5JPD em3idnP1QCUUwC8I1hzxEHM= X-Google-Smtp-Source: ABdhPJy9CiYhlz58IenxE589NXzknun+WvBwbZq7s3c6HO1rcYzTw4B63STtkaMAqBt5auQNI26/+Q== X-Received: by 2002:a05:6512:11c3:: with SMTP id h3mr2536672lfr.366.1615992791268; Wed, 17 Mar 2021 07:53:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3c10:: with SMTP id j16ls5002304lja.2.gmail; Wed, 17 Mar 2021 07:53:10 -0700 (PDT) X-Received: by 2002:a2e:535a:: with SMTP id t26mr2588209ljd.503.1615992790361; Wed, 17 Mar 2021 07:53:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992790; cv=none; d=google.com; s=arc-20160816; b=wp18CEtnme7TzXcLxGMoErGUYVmXe+VywVYpZavTcCFeZOjiYlBAJm9JLf5Y8m+Zyf YQycoO7Wze7+4m+oKJ1WUhl1zSUbJcLk8HPNNiUWIg2J4PIAVkF6oV8134AsJq2NkzeJ vVKW5IfS25TkLh/LgyK2a2Exu1Cptf3lcfGmFZ2w841mi3KVMSug3igsYeK9siMpPs2j Cjt/2nef8P7XEFykm4Q3X+eQbKGjl8XTG4nAB2Y7BZtB9yDoxMFQoRKbAqD90A9BjnAJ Gv4+9cmvAxPDK+iVyLAUjZdVN1dz952v33TnqYZQF33w+2d+JvNYHRpcgBP8MfFj1SGV ChtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=LXRRmcqEnJdbRNYQLvtzOJfpgkerR/2bma68XPh5iPc=; b=cBsJs8S02F5vSFRix7SUrgp1ZqSjX0I3sJga/ZRnwB+SOxruvfoH0rJzW4GkGAUJMd I9q02mBY9VgARP5KUhl4UvpWFQq61k+qGzWXDgdYNwzHUbZqN0z3fQ4tLY9v77yIYzkp USWX1EHTMyr1/Fuq7xoQMtmT+/snAiOVGY1UfhD7Hc92qOs93xYErnIJ+H3E+GpjoGEe USnMUfbksvAw1KbPoRkDGwGHmTCnMLHRrBdUQx+jIMVBYzaW8QyrrysQkwkbBTq38fJS r6hrMtGm63I+jTgGAm+AEHYDBWpKUa3i8xvLMOIODgBz9VQMHlar9re4MmS3Oby37cjQ Lstw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a10si929428lfs.11.2021.03.17.07.53.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:10 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaF032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:09 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 06/11] vm_boot_test: Improve QEMU images checking Date: Wed, 17 Mar 2021 17:52:20 +0300 Message-Id: <20210317145225.88050-7-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491257573168890?= X-GMAIL-MSGID: =?utf-8?q?1694491257573168890?= Makes QEMU start test to analyze boot log in real-time. It helps test cases to finish as soon as booting succeeds and do not wasting time on waiting. Get rid of python-subprocess32 backport package. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/vm_boot_test.py | 59 ++++++++++++++++++++------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index 73fee3e..4c1b6fe 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 import os -import subprocess32 +import select +import subprocess import sys import time import tempfile @@ -13,6 +14,9 @@ import start_vm from avocado import Test +class CanBeFinished(Exception): + pass + class VmBase(Test): def vm_start(self, arch='amd64', distro='buster'): @@ -31,23 +35,54 @@ class VmBase(Test): cmdline = start_vm.format_qemu_cmdline(arch, build_dir, distro, None, None) cmdline.insert(1, '-nographic') + cmdline.append('-chardev') + cmdline.append('stdio,id=ch0,logfile=' + output_file) cmdline.append('-serial') - cmdline.append('file:' + output_file) + cmdline.append('chardev:ch0') + cmdline.append('-monitor') + cmdline.append('none') self.log.info('QEMU boot line: ' + str(cmdline)) - devnull = open(os.devnull, 'w') - - p1 = subprocess32.Popen(cmdline, stdout=devnull, stderr=devnull) - time.sleep(int(time_to_wait)) - p1.kill() - p1.wait() + login_prompt = b'isar login:' + service_prompt = b'Just an example' + + timeout = time.time() + int(time_to_wait) + + p1 = subprocess.Popen(cmdline, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + try: + poller = select.poll() + poller.register(p1.stdout, select.POLLIN) + poller.register(p1.stderr, select.POLLIN) + while time.time() < timeout and p1.poll() is None: + events = poller.poll(1000 * (timeout - time.time())) + for fd, event in events: + if fd == p1.stdout.fileno(): + # Wait for the complete string if it is read in chunks + # like "i", "sar", " login:" + time.sleep(0.01) + data = os.read(fd, 1024) + if login_prompt in data: + raise CanBeFinished + if fd == p1.stderr.fileno(): + self.log.error(p1.stderr.readline()) + except CanBeFinished: + self.log.debug('Got login prompt') + finally: + if p1.poll() is None: + p1.kill() + p1.wait() if os.path.exists(output_file): - if 'isar login:' in open(output_file).read(): - return - - self.fail('Test failed') + with open(output_file, "rb") as f1: + data = f1.read() + if service_prompt in data and login_prompt in data: + return + else: + self.log.error(data) + + self.fail('Log ' + output_file) class VmBootTestFast(VmBase): From patchwork Wed Mar 17 04:52:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 369 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645814oor; Wed, 17 Mar 2021 07:53:13 -0700 (PDT) X-Received: by 2002:a05:6512:10c5:: with SMTP id k5mr2479514lfg.583.1615992793653; Wed, 17 Mar 2021 07:53:13 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992793; cv=pass; d=google.com; s=arc-20160816; b=HtT56rRCp7xeWcgaZuaaCrjv1hcGFJnVpet4WuJNHlpO94uMLvvyOgT1eL+1FB+oeG dr/66zs8gbWYU1nGklhU9qFrKpNmZSROBwuCgUrU7ECsxA57yR85ieAquBxKXJBkYfAS hJ5vvVDAl41WjvPEnUBCs9kz+VW020BlTn16RDHB/pkG0PVhDlUq/yq540MojBrcny5n 5gyQ7UED+TUE4Fybh/pO5iLCtedHJzOYnpqoRTPwfNn92JIiW8OEC6uLn+0jraT5Y7h3 OGLDS+UEmgPaydXHfWsoP1XHgejPf486JkKO/eAxHvjIWx+KNkaWK09lYVmbRBHE8kWM u0EQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=2Qfl1A8XBxnMxDS97VOwboAaIut5EldVTwa9pUhMBws=; b=PAy0MTqIEo0fesC7noLTgB4IJI1pZYULGW0pgHvA29HqQRgoSE95zHuRVwo/XaVyFw zrFEkG60GLszRujg7SJJWGfbfBRyWbBiwu2YmvhWyOw/vf9BZVoB1fqpPkhikE0WjfVS 9cDG05fDnJw1Tx2sIKhf09NbcR2R9MsmHyVGw9qM9TNQBqJF0sTitES0zQpcTn8+lpNc osLeQNTXkL+UZrMcd/9XcYszody1ZLxtQ4UR3Ggj1bA/FREx/P7lJcdSHZC8cIj80GCV 52Gq9MonXwZtZdUlog2KsbppZm+WdAinfUyilmg4+xuObQHUMcLJ5G1VK6R6JAbZZAOc faiQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=jgD6DA+2; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbwnpzcbamgqeq2nsf3a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBWNPZCBAMGQEQ2NSF3A@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id d7sor9623365ljg.76.2021.03.17.07.53.13 (Google Transport Security); Wed, 17 Mar 2021 07:53:13 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbwnpzcbamgqeq2nsf3a@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=jgD6DA+2; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbwnpzcbamgqeq2nsf3a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBWNPZCBAMGQEQ2NSF3A@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992793; cv=pass; d=google.com; s=arc-20160816; b=Myc7e9oALDlUiV2jqFPVZKemQxkhgaM8xCW1xiP93cxDHHH1Kvoak+SvhlQ/BSVCHp rwY7GAoJ6+MfWgOTrAQBFyfaXa1YQPVa9FGMzqija7lyTB1YicQkfyGI+4OnAxen9SV8 DagYq4Oh9VTRL+YVvxHEctMZaxHUfgZNjr8kChPcvo479UQVIG5QRCxG9ENj9wWgJYVs ZXU2J8o0WQcXClZOy8J9eP8DKDkUOMMONw0/jgeK/DxJwyltYKeafMx8M/2kW9F+w9Ta 7Pe6FbrHhCHX0hHLz6qCHweEgYoLRsuTSv8JqRldJE9ZeEJPSjUGgK7AqZTcmyUgWS43 4Ueg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=2Qfl1A8XBxnMxDS97VOwboAaIut5EldVTwa9pUhMBws=; b=hxKpje54TNDMYtugzHBmgrX3ZAVEf+bINrz3hkgvosQagK1Vwp5Ht/PDjJOE/P+GG/ MDUGZi5f2Q/pu1g8RWo/AKrmMuZprRRwHUtP4qk4pQxm364JP0uriZpq9K8YyfNSAQfu 3GjkRqxKHYhzmvDFMJxqEUdvyuij63w5Rew1OdM1ZbpcYc+KBUyo8agAlTGIeDnVQefQ Hxp4CCkdgIbeLRIwjpgAxIqZtynpUII8G6C/BjP3MbzK/tyFQFQBsP+OdHb6wCP8SGQ1 4sksjKqgO8qZSY5JKa/HgKXldXuYEBCXHs4Q/6HFAyAA12Tl2C0+mdDAK/q8aPkTGU8A I6iw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=2Qfl1A8XBxnMxDS97VOwboAaIut5EldVTwa9pUhMBws=; b=jgD6DA+262KPV5Zire2ihLgr3oM9WJJ3h2YwwcdFmiwvNnCXZVULqPLzBw6Wpc8BJt 3KjvYeu78W1/bMFvfbpT0+5sI+RXmLIqrDpvlLeOx/1TEuxVWQ9UKDigTElQ5bZ5TGIn VhAQTs/6i+75B28bLIYheOtmGjngUWYZRagRVxs5EobxCjxbY+1PeXOImWV+oEUZd4XB SNEwWCiCoIMSgR57XsyyMDq9EqasfpO0J/e4UAwlxhHHUeNF2pgZDb4rX/FhMAZrw72H WE7y6wRGP3HDeOjDIzuiknFYDZ14MvQBwV4MGHsIloA5/oVjuPJ7zZJb1QLALiW80euE MtKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=2Qfl1A8XBxnMxDS97VOwboAaIut5EldVTwa9pUhMBws=; b=ZzIHU0WEDGstdwgRP3lyUCVoST332GTKZpQAyCzPwXpPID/7wH7uhGRY0usyQKu6Gq nbDG7TW8I938qVPAVsRF+H4voUht9TitHoo/iJb5pQfiNKk933NrPJ4S1NYrLsHnrHaE YXDjM8hbZJ6nvVL0ym48Dm+srtqpblL1SPspUrC64vN7Bab940c9N9pHYXhV3DPWmo4t z2hPuYvF6iJN56jEe1hXgoD/mjH90d5I2rFc0V1JgI8VDXeb3dPrd1LlHJvtUbqHoVT5 gKTbyAsTWb3YAdDOQL3fVVfFSAxQdzvz38LJvHG81qZJUQal97r9oo0W12ijTXOkuJnU wTWw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532Gwqb2Eyvq1KEDJ6zB9+hrtNOHO+HmuKR1K8AQnzv20ywpypQt Ti/xjVr+4sK3qJv6kWU2xqQ= X-Google-Smtp-Source: ABdhPJwPnnNEiICil4c1tPE7jLk5lqk0+1nrGsse2wd4qOPsuOpJzAVstl2d6NksFA6ySILVJKtnjw== X-Received: by 2002:a05:651c:2125:: with SMTP id a37mr2728007ljq.19.1615992793348; Wed, 17 Mar 2021 07:53:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:e86:: with SMTP id 128ls6949675lfo.0.gmail; Wed, 17 Mar 2021 07:53:12 -0700 (PDT) X-Received: by 2002:ac2:5932:: with SMTP id v18mr2591656lfi.659.1615992792562; Wed, 17 Mar 2021 07:53:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992792; cv=none; d=google.com; s=arc-20160816; b=sgRKRU4vjWlOjD/1wSexjy+y0o+CSCxcIUPaFD358B6Yh3z/HI5cg5SLXk60ab410C Ho4uwnPWaTEFPGYllEDsCGR9TE/7sG407zgIQWcXU8B7HJdKX+R3iiSIo8BmgXsaqOCj /NwDgCHTY2Qk1BCJn31FDnFmqixP9f9ozq6c90dns2EceOnr6QK+xk4fGuhvAhoWBhKD PZ3+sKLuryXDXbQhicI7MDYBuTIaIOBU5vwQW+WCWNr6QTijHbiAKrxUp4gn25mFwbUK yD6uY9Xu6mNCocViycMX6/MfLfr/H4QJzEhwSu05+n7PwvfJoaQsv9CfGNyUIWnqE0cO 44sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=KN3uZjWOb/dzfefsW0O5VeHp1AoyW/pcPNzaisII/8s=; b=mWI3xCTV9+c+9ZCQZ/PKKDOdtF6oud9sh7JYMB+DTjFejaPxwR+HvPxZwB9KIWzj4g 1vNb1kSq7dgh43xKq6vdIvkYq0/Hxx5NtSaHMa/ibpbAVuCRtH1RVKMxv61PTttmbZ0D zDy8W0R6jmABPzpRBtCMqcOHaXApT1+yf6+k2BT10yX8QnekP9Fw9AD4eqLMYXklgOY8 PSSutvVUDTm9waGjveN4WAuUdvYKdFX+hAbIBHOHSIvdekULBuBBNp4ur+jwu7SwaMaH 4CKNCHcV+zIsEf5tNUOrRfT4U+XPP3ss4av3jprN1c/uInK1Gpnik8qpy2l5zhbCR0LB L8hQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id j2si328878lfe.5.2021.03.17.07.53.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:12 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaG032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:11 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 07/11] build_test: Refactoring build tests cases Date: Wed, 17 Mar 2021 17:52:21 +0300 Message-Id: <20210317145225.88050-8-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491259909275959?= X-GMAIL-MSGID: =?utf-8?q?1694491259909275959?= Split build test into classes and separate cases. Implement test cases tagging for external configuring. Also remove the usage of external varianter plugin. In this step, all ci_build test cases were copied as-is without functional changes. Signed-off-by: Anton Mikanovich --- testsuite/build_test/build_test.py | 137 ++++++++++++++++++++++++----- testsuite/build_test/cibase.py | 121 +++++++++++++++++++++++++ testsuite/build_test/cibuilder.py | 79 +++++++++++++++++ testsuite/build_test/run.sh | 3 - testsuite/build_test/run_fast.sh | 3 + testsuite/build_test/run_full.sh | 3 + testsuite/build_test/variant.yaml | 22 ----- 7 files changed, 323 insertions(+), 45 deletions(-) create mode 100644 testsuite/build_test/cibase.py create mode 100644 testsuite/build_test/cibuilder.py delete mode 100755 testsuite/build_test/run.sh create mode 100755 testsuite/build_test/run_fast.sh create mode 100755 testsuite/build_test/run_full.sh delete mode 100644 testsuite/build_test/variant.yaml diff --git a/testsuite/build_test/build_test.py b/testsuite/build_test/build_test.py index 7a55c2f..bc33fce 100644 --- a/testsuite/build_test/build_test.py +++ b/testsuite/build_test/build_test.py @@ -1,29 +1,126 @@ #!/usr/bin/env python3 import os -import subprocess32 -import sys -from os.path import dirname -from avocado import Test +from cibase import CIBaseTest -class BuildTest(Test): +class ReproTest(CIBaseTest): - def test(self): - # TODO: add default values - build_dir = self.params.get('build_dir', default='.') - arch = self.params.get('arch', default='arm') - distro = self.params.get('distro', default='stretch') + """ + Test cached base repository - self.log.info('===================================================') - self.log.info('Running Isar build test for (' + distro + '-' + arch + ')') - self.log.info('Isar build folder is: ' + build_dir) - self.log.info('===================================================') + :avocado: tags=repro,fast,full + """ + def test_repro(self): + targets_signed = ['mc:de0-nano-soc-buster:isar-image-base', + 'mc:qemuarm64-stretch:isar-image-base'] - #isar_root = dirname(__file__) + '/..' - os.chdir(build_dir) - cmdline = ['bitbake', 'mc:qemu' + arch + '-' + distro + ':isar-image-base'] - p1 = subprocess32.run(cmdline) + targets_unsigned = ['mc:qemuamd64-stretch:isar-image-base', + 'mc:qemuarm-stretch:isar-image-base'] + + is_cross_build = self.params.get('cross', default=0) + + self.perform_repro_test(targets_signed, is_cross_build, 1) + self.perform_repro_test(targets_unsigned, is_cross_build, 0) + +class CrossTest(CIBaseTest): + + """ + Start cross build for the defined set of configurations + + :avocado: tags=cross,fast,full + """ + def test_cross(self): + targets = ['mc:qemuarm-stretch:isar-image-base', + 'mc:qemuarm-buster:isar-image-base', + 'mc:qemuarm64-stretch:isar-image-base', + 'mc:qemuamd64-stretch:isar-image-base', + 'mc:de0-nano-soc-buster:isar-image-base', + 'mc:stm32mp15x-buster:isar-image-base', + 'mc:rpi-stretch:isar-image-base', + 'mc:qemuarm64-focal:isar-image-base', + 'mc:qemuarm-bullseye:isar-image-base'] + + self.perform_build_test(targets, 1, None) + +class SdkTest(CIBaseTest): + + """ + In addition test SDK creation + + :avocado: tags=sdk,fast,full + """ + def test_sdk(self): + self.perform_build_test('mc:qemuarm-stretch:isar-image-base', + 1, 'do_populate_sdk') + +class NoCrossTest(CIBaseTest): + + """ + Start non-cross build for the defined set of configurations + + :avocado: tags=nocross,full + """ + def test_nocross(self): + targets = ['mc:qemuarm-stretch:isar-image-base', + 'mc:qemuarm-buster:isar-image-base', + 'mc:qemuarm64-stretch:isar-image-base', + 'mc:qemui386-stretch:isar-image-base', + 'mc:qemui386-buster:isar-image-base', + 'mc:qemuamd64-stretch:isar-image-base', + 'mc:qemuamd64-buster:isar-image-base', + 'mc:qemuamd64-buster-tgz:isar-image-base', + 'mc:qemuamd64-buster:isar-initramfs', + 'mc:qemumipsel-stretch:isar-image-base', + 'mc:qemumipsel-buster:isar-image-base', + 'mc:nand-ubi-demo-buster:isar-image-ubi', + 'mc:rpi-stretch:isar-image-base', + 'mc:qemuamd64-focal:isar-image-base', + 'mc:qemuamd64-bullseye:isar-image-base', + 'mc:qemuarm-bullseye:isar-image-base', + 'mc:qemui386-bullseye:isar-image-base', + 'mc:qemumipsel-bullseye:isar-image-base'] + + self.perform_build_test(targets, 0, None) + +class RebuildTest(CIBaseTest): + + """ + Test image rebuild + + :avocado: tags=rebuild,fast,full + """ + def test_rebuild(self): + is_cross_build = self.params.get('cross', default=0) + + layerdir_core = self.getlayerdir('core') + + dpkgbase_file = layerdir_core + '/classes/dpkg-base.bbclass' + + self.backupfile(dpkgbase_file) + with open(dpkgbase_file, 'a') as file: + file.write('do_fetch_append() {\n\n}') + + try: + self.perform_build_test('mc:qemuamd64-stretch:isar-image-base', + is_cross_build, None) + finally: + self.restorefile(dpkgbase_file) + +class WicTest(CIBaseTest): + + """ + Test wic --exclude-path + + :avocado: tags=wic,fast,full + """ + def test_wic_exclude(self): + is_cross_build = self.params.get('cross', default=0) + + # TODO: remove hardcoded filenames + wks_path = '/scripts/lib/wic/canned-wks/sdimage-efi.wks' + wic_path = '/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img' + + self.perform_wic_test('mc:qemuamd64-stretch:isar-image-base', + is_cross_build, wks_path, wic_path) - if p1.returncode: - self.fail('Test failed') diff --git a/testsuite/build_test/cibase.py b/testsuite/build_test/cibase.py new file mode 100644 index 0000000..68debca --- /dev/null +++ b/testsuite/build_test/cibase.py @@ -0,0 +1,121 @@ +#!/usr/bin/env python3 + +import os +import re +import tempfile + +from cibuilder import CIBuilder +from avocado.utils import process + +isar_root = os.path.dirname(__file__) + '/../..' + +class CIBaseTest(CIBuilder): + + def perform_build_test(self, targets, cross, bitbake_cmd): + build_dir = self.params.get('build_dir', default=isar_root + '/build') + quiet = self.params.get('quiet', default=None) + bitbake_args = '-v' + + if quiet: + bitbake_args = '' + + self.log.info('===================================================') + self.log.info('Running Isar build test for:') + self.log.info(targets) + self.log.info('Isar build folder is: ' + build_dir) + self.log.info('===================================================') + + self.init(build_dir) + self.confprepare(build_dir, 1, cross, 1) + + self.log.info('Starting build...') + + self.bitbake(build_dir, targets, bitbake_cmd, bitbake_args) + + def perform_repro_test(self, targets, cross, signed): + build_dir = self.params.get('build_dir', default=isar_root + '/build') + quiet = self.params.get('quiet', default=None) + bitbake_args = '-v' + + if quiet: + bitbake_args = '' + + self.log.info('===================================================') + self.log.info('Running repro Isar build test for:') + self.log.info(targets) + self.log.info('Isar build folder is: ' + build_dir) + self.log.info('===================================================') + + self.init(build_dir) + self.confprepare(build_dir, 1, cross, 1) + + gpg_pub_key = os.path.dirname(__file__) + '/../base-apt/test_pub.key' + gpg_priv_key = os.path.dirname(__file__) + '/../base-apt/test_priv.key' + + if signed: + with open(build_dir + '/conf/ci_build.conf', 'a') as file: + # Enable use of signed cached base repository + file.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n') + + os.chdir(build_dir) + + os.environ['GNUPGHOME'] = tempfile.mkdtemp() + result = process.run('gpg --import %s %s' % (gpg_pub_key, gpg_priv_key)) + + if result.exit_status: + self.fail('GPG import failed') + + self.bitbake(build_dir, targets, None, bitbake_args) + + self.deletetmp(build_dir) + with open(build_dir + '/conf/ci_build.conf', 'a') as file: + file.write('ISAR_USE_CACHED_BASE_REPO = "1"\n') + file.write('BB_NO_NETWORK = "1"\n') + + self.bitbake(build_dir, targets, None, bitbake_args) + + # Cleanup and disable use of signed cached base repository + self.deletetmp(build_dir) + self.confcleanup(build_dir) + + def perform_wic_test(self, targets, cross, wks_path, wic_path): + build_dir = self.params.get('build_dir', default=isar_root + '/build') + quiet = self.params.get('quiet', default=None) + bitbake_args = '-v' + + if quiet: + bitbake_args = '' + + self.log.info('===================================================') + self.log.info('Running WIC exclude build test for:') + self.log.info(targets) + self.log.info('Isar build folder is: ' + build_dir) + self.log.info('===================================================') + + self.init(build_dir) + self.confprepare(build_dir, 1, cross, 1) + + layerdir_isar = self.getlayerdir('isar') + + wks_file = layerdir_isar + wks_path + wic_img = build_dir + wic_path + + if not os.path.isfile(wic_img): + self.fail('Build was not performed before: ' + wic_img + ' not exist') + + self.backupfile(wks_file) + self.backupmove(wic_img) + + with open(wks_file, 'r') as file: + lines = file.readlines() + with open(wks_file, 'w') as file: + for line in lines: + file.write(re.sub(r'part \/ ', 'part \/ --exclude-path usr ', line)) + + try: + self.bitbake(build_dir, targets, None, bitbake_args) + finally: + self.restorefile(wks_file) + + self.restorefile(wic_img) + diff --git a/testsuite/build_test/cibuilder.py b/testsuite/build_test/cibuilder.py new file mode 100644 index 0000000..85a5678 --- /dev/null +++ b/testsuite/build_test/cibuilder.py @@ -0,0 +1,79 @@ +#!/usr/bin/env python3 + +import os +import shutil + +from avocado import Test +from avocado.utils import path +from avocado.utils import process + +isar_root = os.path.dirname(__file__) + '/../..' + +class CIBuilder(Test): + + def init(self, build_dir): + os.chdir(isar_root) + output = process.getoutput('/bin/bash -c "source isar-init-build-env \ + %s 2>&1 >/dev/null; env"' % build_dir) + env = dict((line.split("=", 1) for line in output.splitlines())) + os.environ.update(env) + + def confprepare(self, build_dir, compat_arch, cross, debsrc_cache): + with open(build_dir + '/conf/ci_build.conf', 'w') as file: + if compat_arch: + file.write('ISAR_ENABLE_COMPAT_ARCH_amd64 = "1"\n') + file.write('ISAR_ENABLE_COMPAT_ARCH_arm64 = "1"\n') + file.write('ISAR_ENABLE_COMPAT_ARCH_debian-stretch_amd64 = "0"\n') + if cross: + file.write('ISAR_CROSS_COMPILE = "1"\n') + if debsrc_cache: + file.write('BASE_REPO_FEATURES = "cache-deb-src"\n') + + with open(build_dir + '/conf/local.conf', 'r+') as file: + for line in file: + if 'include ci_build.conf' in line: + break + else: + file.write('\ninclude ci_build.conf') + + def confcleanup(self, build_dir): + open(build_dir + '/conf/ci_build.conf', 'w').close() + + def deletetmp(self, build_dir): + process.run('rm -rf ' + build_dir + '/tmp', sudo=True) + + def bitbake(self, build_dir, target, cmd, args): + os.chdir(build_dir) + cmdline = ['bitbake'] + if args: + cmdline.append(args) + if cmd: + cmdline.append('-c') + cmdline.append(cmd) + if isinstance(target, list): + cmdline.extend(target) + else: + cmdline.append(target) + + process.run(" ".join(cmdline)) + + def backupfile(self, path): + shutil.copy2(path, path + '.ci-backup') + + def backupmove(self, path): + shutil.move(path, path + '.ci-backup') + + def restorefile(self, path): + shutil.move(path + '.ci-backup', path) + + def getlayerdir(self, layer): + try: + path.find_command('bitbake') + except path.CmdNotFoundError: + build_dir = self.params.get('build_dir', default=isar_root + '/build') + self.init(build_dir) + output = process.getoutput('bitbake -e | grep "^LAYERDIR_.*="') + bitbake_env = dict((line.split("=", 1) for line in output.splitlines())) + + return bitbake_env['LAYERDIR_' + layer].strip('"') + diff --git a/testsuite/build_test/run.sh b/testsuite/build_test/run.sh deleted file mode 100755 index a8ea9cc..0000000 --- a/testsuite/build_test/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -avocado run build_test.py --mux-yaml test:variant.yaml --mux-inject build_dir:$BUILDDIR diff --git a/testsuite/build_test/run_fast.sh b/testsuite/build_test/run_fast.sh new file mode 100755 index 0000000..4d1bf44 --- /dev/null +++ b/testsuite/build_test/run_fast.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run build_test.py -t fast -p quiet=1 -p cross=1 diff --git a/testsuite/build_test/run_full.sh b/testsuite/build_test/run_full.sh new file mode 100755 index 0000000..af5ec59 --- /dev/null +++ b/testsuite/build_test/run_full.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +avocado run build_test.py -t full -p quiet=1 diff --git a/testsuite/build_test/variant.yaml b/testsuite/build_test/variant.yaml deleted file mode 100644 index 9ddc634..0000000 --- a/testsuite/build_test/variant.yaml +++ /dev/null @@ -1,22 +0,0 @@ -variants: !mux - stretch-amd64: - distro: "stretch" - arch: "amd64" - stretch-i386: - distro: "stretch" - arch: "i386" - stretch-arm: - distro: "stretch" - arch: "arm" - stretch-arm64: - distro: "stretch" - arch: "arm64" - buster-amd64: - distro: "buster" - arch: "amd64" - buster-i386: - distro: "buster" - arch: "i386" - buster-arm: - distro: "buster" - arch: "arm" From patchwork Wed Mar 17 04:52:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 370 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645838oor; Wed, 17 Mar 2021 07:53:15 -0700 (PDT) X-Received: by 2002:a5d:6b50:: with SMTP id x16mr4711223wrw.379.1615992795144; Wed, 17 Mar 2021 07:53:15 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992795; cv=pass; d=google.com; s=arc-20160816; b=0fbVOBkB8CyEMxywnOyCUg9z8BsuwgY08C3b3lKRLMk6IosrY+Ntvw5Gw5abmmFvQP zPAj7/n9V+ogJUAOnn7s4pJe6fD9BRmLaJV088zie7FgNkryX6WNvnEFoaYy/192NbCV vHNu9Drr4NvJmfJLUCK5pwxTrcak15U3S1Fs+dFySHRxpDhfRl3o2nG6uBXZSj3moUF3 9jMDe0BTFHFoxN25//jYzW4i3/QSRmSYy9GtcTy4Iejm23BmcPYyhvlw1B+G4YChGMfR GD+Gzj96gRurN7oH5f6a3hbnycVPNn1e+fZxL80GbKVaRdZ15JRGeAUi+okmBo1umDPL 89Sg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=UbqyGiH3doKMPlKSUBNGuXfM2ZzUsAh8pgI4+l5Ah4A=; b=u578+tYIM8mQ4Np5vwN8F3gXM0vFquUQRJgZvVX18YzcevcdQwt07haXuCrvnHJuNx H5p2bon3Z51TdQYWC3KVF5TAjw4EJ4lP0mzbkSlK3kb/xcOAFNUM8qN3otBuXZWiF184 LHe9H6Crz6tavVkLFhkTXOyXASgXaciLRZL123O5lj7uibipoH9As++GEXRnuUAQt2pm PaR+I66235dR+9Z0ioyRYWCwu5TkdT25JLXcshItOu+dIL9TbkImyTTZLP1LBW5eRTk3 wmFBRlMwNHD7RGw1x57NaSkKjTK2e28YbaQqG2xDUQF3zyG7qD2WLt6Q7zUbuQrZGVX/ od5w== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=c9ANWtCk; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbwvpzcbamgqeshiocky@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBWVPZCBAMGQESHIOCKY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id j34sor900782wrj.33.2021.03.17.07.53.15 (Google Transport Security); Wed, 17 Mar 2021 07:53:15 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbwvpzcbamgqeshiocky@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=c9ANWtCk; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbwvpzcbamgqeshiocky@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBWVPZCBAMGQESHIOCKY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992795; cv=pass; d=google.com; s=arc-20160816; b=cQR3wnw2uUpCluebKAcgWgUrV//LbVJFfNBUyfzr9j6RgAuiQQYdNmQBv8nTZbcXiP qRqJgBI9A5BibjYoCyRA1swPLO8exeuBe6t4vw4xlEvJhRKOhic8Ye/cvXr51Ans0JdG s+Muv+DtjbZnKgptZ46/KO1/44xoCylVS5h43ywABvoUtU5Bh5KbT7ZvyaQmO20sKFD8 LoDyhJnhGfWj5Hdw99l3uf/ll4TVDpxs2tE7KAims4gzk0FlhOBa3AnA4Tzo/oMEwmCu I+hVyrxVvS6TJP9eEf3sTffa+aG8afYieie9P8TDddv533kusGJ1Syi6Suy2+xnHHOLD vnGw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=UbqyGiH3doKMPlKSUBNGuXfM2ZzUsAh8pgI4+l5Ah4A=; b=vWKViGSjL+zN7IPyYzuKfk/+WQoj5KZIb2qZA4pmnQlip65+KuLhn6tdGyuL6O6Djh qkZ7bvvzIBuIG6mcn9ew8jVfk1OEBQosovo80KcmUTlVGLEjUL1UWYz2qKG9ybX/Y4U/ Ue5S8L1ZUPP51P+6sYZrIuPIr1sRWlJo2I9gsZCKs5FUMVg2bwD/Yj6VP77Jd2738CrW 12rrqWImwuugI18DWDAo64Zo94/X8OtcNAhK6N3mK5aas/JrANO9KpaWbV5j/lA5lUZF buc32meTMJ6ZM6w8mOjkiD+qBMhxrfYgw8Wht6eNzSX6hhvTTp73GzHWFuljiFhPts+q Dolw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=UbqyGiH3doKMPlKSUBNGuXfM2ZzUsAh8pgI4+l5Ah4A=; b=c9ANWtCkm9wDzKxY0xYfeOPLCuI7x1zjScoBVE6yRVUS9bUFKJHD1si2OeDOKP5mOh Ou9Ud9taw5Dq4lf6V10YpC4PADSH9vqzFpGmdy1D+U5PnFfQxyy3MKYv/xysE69iQsMX csuoMcxJgXFy6CyGiZcdyuA8DPsfY7BAzUUFzRWTTyCYbC1ZozAQ6Q158vmqfjCCl4v3 E0mcMFJZqYDoNrS/5v7R0Cbqg42itMuDCNF5jzDSCyNupU11GMvfkFKR+yPn7/Q/7L+Z nNGs7wFACowyFJaSYpvLWFAsgOKnyJN/384VbAYbdqCDcHRPG6Dj/NG2Syt18+OnD5RA W0UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=UbqyGiH3doKMPlKSUBNGuXfM2ZzUsAh8pgI4+l5Ah4A=; b=bLK5HGb6jhS5uzRl5n9qjvWgfE3OZj8OxzFUNvWsCBDThSbC92TP/AMKc6di1BDiAU drByvE5oURQBL1f7LhKZ9v9jQ/AtQPECffvgIUsemvfYxgFG/jk8wPbwdLMq8fKrfMG3 E8XzPQBIvmq+TZ/zSJKoCtRN/9WKrsjPqqTBYCz5wx6BKjNgu9pmIj2qU8/5BHHZbZbf 35NjJlNaxQFahXLjSiRF9/IXU8FfPhv+iwYNKrK+jr4XcQT57LwuyUqjpgoxHgkqN9LF Kzqv4fsWO67TYQoY6yll+ZOwrlzu22ffstUpE+jcjfM8YAjyi+XtcsbgyXJnij1OdgUr lH9A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533CNUAB84I3rIwYQRqhawKuLhMYkRD0vKflWMSRrN+pqk7HR68s pZQm11WlRjzCbM3IMeHs9Ik= X-Google-Smtp-Source: ABdhPJzAINnfb0s2xjSbrFNUjY28XOUOX0dZLUNgFbE6jz9OhKv/Nf8V5bSfzEu+fvgzwGXyUEuNzA== X-Received: by 2002:a5d:570b:: with SMTP id a11mr4855219wrv.281.1615992794918; Wed, 17 Mar 2021 07:53:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d1e6:: with SMTP id g6ls5261855wrd.3.gmail; Wed, 17 Mar 2021 07:53:14 -0700 (PDT) X-Received: by 2002:adf:f78f:: with SMTP id q15mr4737667wrp.383.1615992794207; Wed, 17 Mar 2021 07:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992794; cv=none; d=google.com; s=arc-20160816; b=cu57KS862vL9bbH8ZV1rpaK84WICleG1VSVUGG9yTtlBptz6FCESHSO2ij7ZnxrtaP /zGX3j/U4JkEVE+oOVvduMBi4SiTaLycTMAJlLdkF4b1nzIHezOJX6A+EKVjw4BWou8h qNydPjkpnDlhWiHJ/4ZSIbpBGvr6DeJqLc8pyX4hcAyxT/LBu9FC33bxkf9BgJasQXEy dw0tjJx8PY3RKTB6kIZh2Nmwde5iu0tDtR4qDpv7ic0r1tbXMslE6PdR4pM009E+HgG3 VWQBOL8opR/uT7HToekY/3SMm+2L2ehYVuIe/OZUZN4HJACh9y5hROoAUW1LDHBcWOLT auyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=b8+FtumZo2V+1pjz9RH/qm1ojXRvUTz3rAuO86fpk5k=; b=SHipp751P3CjUsYSS/ZR6/HCZ8cIOHUISpC2Mz30yOgQha2T1raixh5GAITtsqCLjB uOV27Kughr9DFWfKqnNFKK/gv6bqinqFyrlByciKc52iA0HlJDp+/1P9M83buq+FLslb jT83HnbaROfwacZADlRpMdE5BdlIU/oySkz1V8fBzzcArmpeXKObqWApDvf+RR1TIvY5 Igy7tx/vPlUlzqhVOCRljTDt7boNzbzc2cqJcD9W4HkxZa3p2xqNCfl38mE/31xKmyv9 SToP63k/ebZfAsJ5GK6wDdybbJWcH56Oh7oAf8kzpKdAiDieaKxZtxQGGZm5rdJn6JXS V32w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id p189si73835wmp.1.2021.03.17.07.53.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaH032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:13 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 08/11] testsuite: Add Python generations for testsuite in gitignore Date: Wed, 17 Mar 2021 17:52:22 +0300 Message-Id: <20210317145225.88050-9-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491261514478310?= X-GMAIL-MSGID: =?utf-8?q?1694491261514478310?= Ignore Python byte code auto generated files inside testsuite. Signed-off-by: Anton Mikanovich --- testsuite/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 testsuite/.gitignore diff --git a/testsuite/.gitignore b/testsuite/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/testsuite/.gitignore @@ -0,0 +1 @@ +*.pyc From patchwork Wed Mar 17 04:52:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 371 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645869oor; Wed, 17 Mar 2021 07:53:18 -0700 (PDT) X-Received: by 2002:a2e:b613:: with SMTP id r19mr2596294ljn.300.1615992797848; Wed, 17 Mar 2021 07:53:17 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992797; cv=pass; d=google.com; s=arc-20160816; b=ovwErayowj25GpB75l7jOw3a+9Yt7AMP/EBk5gKaenNw/EWIFLfR7MZWcYPn57mQnz wuNEAO/b6HLokRtt/fWhpZ5Nbw07nxyCOrCBnRQg0FZ1Q1nRlsPg3ZVGUTjtmvJF4tE6 5NRPdu2v8qcCf6N8eN8x2E4T3neFr4qkqzEBp7JrCyYeVZ70oOwjPFw4M1oy3LgBTcu6 vE+jDRIVTzoRVNvbHFlPRRlTkPWIbWmlc7Dx+IYku22KIBYJs+4y6m+TehEXk/S4IfsU zO0Y3RKsEuT7IitLTHhBxxi9HrR+uoTR5ypStsd/LkyZuTG+crzWFUbpMt82S/tu38Y7 3mqQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=yf1tuPhwNORa+b5XWbWk0cfOlAcrL3ALltVjaTPc0As=; b=Zjm9rIRLiZBkM6bVJvZ9lr13IQBOqS9/txYPRJTo9Jgh4pydVFeFPYpVFbbUAVbjBC JWehlr9DYWr7UMTPQXgcoW4idgtdWMznMqoiWUhQbXv7eIfGbweC9NkA7dKvBlOaSKjt u7hntPJeIlaLnUCopyTET/HSQl7QWbvAuDUNG2nDvh/LKdqCumGq/DjnJwLdC7QhqcmO jA5MNQH74VBxxDDq2wG6L2SLU9CwbsDNmbky0zGk10Aaiy9ggcwN+vOik+/9ULcYP9UD wfv/v2EWdwEtN8mE8eMjGk0aj8wpkU6t6JPhs2hmme9ytckSdG9E4+ej1R9gnLAYiViW a5KQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=r8x6hSZu; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbxnpzcbamgqe5xnbqgq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBXNPZCBAMGQE5XNBQGQ@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id d13sor9525499ljo.40.2021.03.17.07.53.17 (Google Transport Security); Wed, 17 Mar 2021 07:53:17 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbxnpzcbamgqe5xnbqgq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=r8x6hSZu; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbxnpzcbamgqe5xnbqgq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBXNPZCBAMGQE5XNBQGQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992797; cv=pass; d=google.com; s=arc-20160816; b=fRVbDhGnIDUa983BUrIIG0t2ouMmrr8jUoHORLPLjxDGdUuzBhcBrzl9Af5BLFiinC AFk6aiwV+cXJg0Y+TMX8A8FpEQtt9YmyjLLEBJ6h5BtHhx/jDJBovJl24jsg9aDzcPe4 1pKRTivK+LhgzKR5Slo6Ay9XZiJNXH29w4T5BjGSIlfVm8e5yS6mqYIn9sAzq4QpjbJh PW7L8Xvtgj+4YW5IwJqPoBiE+7RQQJ7roe+b3Qlnr0tYQKrhzlgft7uvxMB3g/am3sTx siGNx4UigPMkHtpbQeIKzdwuivNIN9C3/qzPBUPvJy8bi9hxEIA479O4pnma+6UhHb9X Kc0w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=yf1tuPhwNORa+b5XWbWk0cfOlAcrL3ALltVjaTPc0As=; b=Nf/AM525BnvVBiw9r/GwTo+JbxTc/wzwiraqz41ouBg8PCnaEmghU+diZHjUUEi6vo WwgnB/G3Sb1oZoxE4uEIUIR4NNSPQ3tdpJ9Zdg2F64W60NKvuNs6cecSUi2A5QDZHj+z bfV8PaLTAoEQTdcI48Vnf8zPzCBBhDT7WoF1ARCIRmq1MF8e7UjNpxmZo0BQa6T5HypR VW93ckGVIXWh3X+cphaD43TPgqqYuLKvNgrnzsKzXY3sLvilXoSjCZvVvUTineWo52ek kE9QJ31EotSt7nZx9qY6qTjx0s/K25d86sAT3mWbhfpeZnKAHEN3Pxo9Ud+xW8q5Z0ML hgzQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=yf1tuPhwNORa+b5XWbWk0cfOlAcrL3ALltVjaTPc0As=; b=r8x6hSZuxrO2T3iqyoh4TT7FxnjTyF6ZucMVYN6iEJIOu1JflAjSgelY9U1cn6Drql aqp9zv4v0gV/MSt3YEumj91rqFcN9zb2Kx7jYnjYUJnp2ts8ieTqYCO+zctJQHcLoP8I M1AupD4MSkkM9vrIgogZrrdwZTcWaYHBItxO99xLHs5PpFvfvuidggfDZA7oxNpUSN4T 4edPB2rNmNDuvtmElvLia0vcmt/NVTXfxzlp9w+sAo5CPcmVq/ow0bJez7SU2UODzzDE YNuagG7aDgGgIWk3XLSI7EOJmjYbkvxfStcuwfaQx4wy8/T9unml/wbSqcvQdj28VIsn ADaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=yf1tuPhwNORa+b5XWbWk0cfOlAcrL3ALltVjaTPc0As=; b=RG+DzA9YPE6BXydORknxNFNgtUjPUlFpuutIpWc4LhpZthiPW0+9eFmDvSdE8LPd9u QBnQCrlZijGlPP6OAYg4hjC2ghkD6Xihbqetx4oXQPIL1T8YHtb+4xK0bzI/H+ZE9oGj BkESHd3Q3LtMrNTEgIzAgt0ZyHByEClPSHUvYm/HKyiKTDp8309T/vtUUl6R3JEpjcsr 5BokGuV58ZOFWL0EFy/Du5DPup5d4UrUPAUpziWuPBLENh6pWq+JuLPEdyMTxRxHiPes oT+RUXOvCaGTUjXi2gqAbVk2Lq69tgaTmYi3Kvxd4VvWdbN+FsRHqEu6iNR+fqL3ThS3 wa5w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532fJunuQauq7EquzNoGwdSf/Ug+GNYFk65U0HmL4y0Vj7DmEi2Z qx/Y/Q1FZmWnDrpVcxdgEB8= X-Google-Smtp-Source: ABdhPJyS3GUaWs0/7ehEs5oU7XlRSo0hegmTFgJymgO0LtbzDdwYPMOy8U4JU+bw+UDKyJyKOJCfUw== X-Received: by 2002:a2e:8592:: with SMTP id b18mr2666597lji.155.1615992797542; Wed, 17 Mar 2021 07:53:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3993:: with SMTP id j19ls6960622lfu.3.gmail; Wed, 17 Mar 2021 07:53:16 -0700 (PDT) X-Received: by 2002:a19:c1cf:: with SMTP id r198mr2469672lff.11.1615992796769; Wed, 17 Mar 2021 07:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992796; cv=none; d=google.com; s=arc-20160816; b=W/vDZmOoe9zLeWJfY5wN1SECxZbq+9Er0lQCyH5tyWFq/USokVLbXFDuEKHCnwEifv RNi9bLn9+2tCum2CAJicC8sGwaP6+WODBfZZPNQjrdrY9vdqcKuvBevKLj8Tx9frwrIS 0+0K+NX/S1Jcz00p76D/2jSa7FpLqtih26U3vhnQPmqJyDr7nObi2BcNqEWQyylx/29X sLiUUnc5GsjEE0iUidstBRpbOZjaI5MxLOJ3/dwHHneNJcAMrlXfMGXuKZ0jumype1v1 6Sb2Sr22jlb2A5k8RMZ6yU/cY9s40YQGW8fqSwhSy6naxuM57wCKj2+F5ajUt3lvByEe 8Eww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=FhFrozdUMyDnrP8hwAVtre3aFOgbkA8xqj6NK+Fijqs=; b=Rh+Z6bKAGh+Jn7K4VOLweqPp5QqH/o3SZ/PPG0lwRjCCdDFPdNtKMot3bNgzxFtROU IMzEqv7//CvTdrLAXk99mj4dnnvBisifyHf/IicGdHZUjyYE2HKfHd8OY3V1txJ6AdO1 DQIk2BeAaqAHUPPN65FZE8VBMKjfbJniFd1IE5iUpjq61YrF2hH79YRlRrLk6X0YjVHC k2b7p/SDp/nDUJvRoPLETE7LSAH2/dP9KGxJOZrek1oXf1mP8JHs/GZvaym77vMlETj1 6hfFbSvAxLnEmX1Z9uRFaR+X/APtRA0w3ehWm37w6QChtsazIRyebCkwFeIkZ4ozfaZK uKuQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id j12si669799lfg.8.2021.03.17.07.53.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:16 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaI032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:15 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 09/11] testsuite: Fix test suite prepare guide Date: Wed, 17 Mar 2021 17:52:23 +0300 Message-Id: <20210317145225.88050-10-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491263910298122?= X-GMAIL-MSGID: =?utf-8?q?1694491263910298122?= Remove deprecated yaml-to-mux plugin and yml variants from the doc. Also remove subprocess32 backport installation which is not used. Signed-off-by: Anton Mikanovich --- testsuite/README.md | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/testsuite/README.md b/testsuite/README.md index 5e64223..f91ea29 100644 --- a/testsuite/README.md +++ b/testsuite/README.md @@ -4,29 +4,14 @@ The framework could be installed by using standard HOWTO: https://github.com/avocado-framework/avocado#installing-with-standard-python-tools -Then you need to install varianter yaml-to-mux plugin by following these instructions: - - https://github.com/avocado-framework/avocado/tree/master/optional_plugins - -## For Debian 9.x - - $ sudo apt-get install python-pip - $ pip install --user subprocess32 - $ pip install --user avocado-framework - $ pip install --user avocado-framework-plugin-varianter-yaml-to-mux - -# Pre - - $ export PATH=$PATH:~/.local/bin - $ cd isar - $ source isar-init-build-env +## For Debian (tested on Debian 10.x) + $ sudo dpkg -i avocado_85.0_all.deb # Run test Each testsuite directory contains: - - run.sh - script to start tests - - variants.yaml - set of input data + - run_*.sh - script to start tests - *.py - test case # Other From patchwork Wed Mar 17 04:52:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 372 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645896oor; Wed, 17 Mar 2021 07:53:19 -0700 (PDT) X-Received: by 2002:a17:906:4ada:: with SMTP id u26mr36094631ejt.129.1615992799655; Wed, 17 Mar 2021 07:53:19 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992799; cv=pass; d=google.com; s=arc-20160816; b=sbt7bVnbu9H+tLueItfCRHMlO02EQP/7xOicd5jjXR+LT6YkG98kOHhGCdnWhS9ub+ GzEs0PBqxzZ6gAi6Dszfz62qX+RNV1PVomX8mfUR6iSMdefh9j0mKbmRwkLf0SXemOEo yBt8yuIGhxG08VR5SMbw8rIgoR9+RH/w38e75h9O7qtRkCTD7EkrX1tXYbKR1Nf8ETYE ZhJESkipdTRpJ9JyZlatvrygtLqAqNGPjKE92+d2ESdVDdBowWcWKhvLCyWFPyEAdQqq JqnpE2XTafu4b9/FzBopMj8bRihOlvmYq/A4NQa8YOqiGTMDy+yMrNOx4NbztTjYLZbz WZsA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=9F+Ha4lSa0rC0TRE7ApxCN8CbK4/cRq6ugVj7rBu1n8=; b=LYy2v9j4e0JaR5Ckix+QqMrXrOzTPr/NK19Qzc427fgCVi4Dm2WHqEfaIJFwCP/g3H 1lDGIyIw7tlIM20TKVzxIiDtGItOTuTO6KJjGFNC/dCPvuOcKissqaRqWNZ+HbdJauKp wE+GgPq3LJOoGIQn4IhypDJmsJjaZh96/41P8fh0Zbp/9tiQ0ZWpvfCaJa8JMqZdXzMp gpE7GsBTqhPa0Ui91gFq9lX47gBhJwCOMOL5bxNy1OWOglxQOhMMXxfFi/trhfPxeKD1 TBagWJLs/GSylVLAdOgKPxLHaQ4TfqbbH1+rWpI9evFe/hvfTprXysdMuUBi5Ut1Y7JG Ho+w== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OvtYCWvJ; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbx5pzcbamgqem7ocu5y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBX5PZCBAMGQEM7OCU5Y@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id gr3sor13093138ejb.68.2021.03.17.07.53.19 (Google Transport Security); Wed, 17 Mar 2021 07:53:19 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbx5pzcbamgqem7ocu5y@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OvtYCWvJ; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbx5pzcbamgqem7ocu5y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBX5PZCBAMGQEM7OCU5Y@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992799; cv=pass; d=google.com; s=arc-20160816; b=xyYlaD4HSqq9k7Gtbi0tC6CORFONn6ojG4mYR0rUiJGQYIBovL/dlSpk+NCn/1izkr rx9kP3DypFfb6L06WRH7YYUQWq2ofYKGJ9tfWpY7BiAdNXktyoCAIg7WW2Bd7MJJxXaQ +eGUC5VxKN+srYU9cPek/EHPiMzKAUeBJvYeoPiBUoUKVl3h76heTtskaeDjCmYBANeY 9nGEUTf6qwOqbpTVwZbBTaeabSrRieB2Bp/2HBn5VdMoeTSOuUF70tHBPf9FmIgL1Es4 Jni4LTzIDFwmdZthDGb3aXnqIN9SFWYye5we7D/CpOgs5HEaHTtq2XmpSti6E13/4sOC GgJA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=9F+Ha4lSa0rC0TRE7ApxCN8CbK4/cRq6ugVj7rBu1n8=; b=ltEeYSzuWkTjQ08M7OpuE7e9jKYYXpteAJrZx1oRcafjT+ne5khl8zD3M0U3oW70nD Eeawz1oYSP9YmtobNR5vds/MUnEBONWM9+oJDuyt90b7gUU+gCv9wQhW3RKk6kYpIQ5q 3ZDXkq0fstxyc0whcKwn84RV3SsfPwOK44WYBnpljcNx6Rn6bIYNXvAHRUeCQfVQGeQO 34nlJjiMTvskedo0wqNThJ2efCoh018SU1EQEaIo78INyqmT/0eyFz9RTJ7/vFNFXWc4 DD18hI+4uZAmOI5y8X//SkcvD5v2VkIpXQyXZ9jJCWcth2WAjEg937WYl0OKI6tGwVI1 X2Hg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9F+Ha4lSa0rC0TRE7ApxCN8CbK4/cRq6ugVj7rBu1n8=; b=OvtYCWvJeuKcuaw3MFJ2pN3OPw+WEBH6RqAwZCyk6gsNhNw0kkk/GALceKJQReGt3l J6/af5gCEnE3nB+mO8ZXWaU5ujiZu1yGbUba7VTWcpo0ii7e68C9vtE4FrLDmwn6ej/C WGOv5YnRsZAVcpngHrGkiC7yJ8B3CXO8vhimS8/1gXE0tJkGDW6RVQQ6Lpq5Mp90j5nT yuW41N0ZthNNvnL2GAirsc2JB8SB7vdul+NUJXM5XTsHNIxdE+pZLS8S91+QLzjHlm0G ukeiwop7fm28LbqQjY9D3OUb6CptpWvBy8v5fFTRJfmWhzZSrZ4v+/l0Ozf/EUggyMX+ /+AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9F+Ha4lSa0rC0TRE7ApxCN8CbK4/cRq6ugVj7rBu1n8=; b=LWGWLAbZUSN0Meo+Iev6Sig4ZZXbCfG3gjzZxoJ+Nlcsd3hYvH8DDY5nXi0xCoA0p/ oQXhKf360hQxwnGx/8bvaRZCSBHsGYXOKhwBa+x8PvR2IXNZI/W73PWFp6at5zN6nLzt gWN1hdvF9obCzQU+2sK8X44nsSKRMoXIydgea2fYO7YspP14FCM6f/FURHYcKa2FZT+Q ObQ3+3JZGkvRnUA+wS2rtk2mpZSIxqPdxvN1cX+969F/+vcLnptYzVJjazocPXj7bqyf VNIFZAiFhepBBrTRvz1gnTPgiFbj8Nj5vU3u6BgA1Lw0HvlXRxrvg9JxrwhmHXKP3VbZ H1wQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532eDAw7486DFr7iCK5TG4nrOY1QTdar+G27tADofL+RXXwK/N0W n1kf4bE0ShLbBPEcoRLhwhE= X-Google-Smtp-Source: ABdhPJzAGu2rGOWRyIAqabO3x7oW2yuAsoJQ+khKvHwYziO8mlmZKfcf9mQ9BY7c8m7V+XFrAyvQFA== X-Received: by 2002:a17:906:86c6:: with SMTP id j6mr34510340ejy.197.1615992799284; Wed, 17 Mar 2021 07:53:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:50cd:: with SMTP id h13ls1543066edb.3.gmail; Wed, 17 Mar 2021 07:53:18 -0700 (PDT) X-Received: by 2002:a05:6402:1691:: with SMTP id a17mr42588492edv.336.1615992798557; Wed, 17 Mar 2021 07:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992798; cv=none; d=google.com; s=arc-20160816; b=k294sHW07fbLF3A0aGtrz9CiJmQ8bs4bmBTIBljhHxI0uGAYFiT5XwDYHo9ORHzY3t Y1jwmYJDsJFUY22pfH3z3+m2wEm1iuyZGbOFscvKFgcNHDIHMCxZvt9CWKlYF1RdNvCu ZPnB9dAi4OQEN+qQOSGO2vlLb4IWAG4xFFNW0x6ayAK/Bl5/j6FC2SOBVtdGnGzJvkDm wc0f4Z7SaL0Kld9JBGb4SuXFBeEm0X069cVT5sddBadgKnv7VY1JyIGfAXB5bLSVYGLb FDrGQdAKBgzPFuNcElos7o59NLuL2hqGYgY931nCtUj5GxhHilEbFof59STQNLSOesxf AJHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Dsv1soH5pOtD0SBemJIS/po33GS3e5o0ZaDScKhBsdE=; b=DTcyMY2XAchQWyg+DrH79Sg4hepZEL1BVCjvAx0eqjvrrxbvmOIYn0SXobqTGZxZMW dy/5TJ6MRmuzRCX9+mp6EpItqnif/JxEskF/MvqNsU+F9a1EiPRr6zJ43gratEpBIN1J 8WdxEkVUW3JN88IZfnZNE9q74W7mNfqMcK1jY/bHrldwFkJdslkUQTpimI1fMm9Ey1cr byFuvWD6Wmw/1cjknxGvzOg6aUhpWl2j0koRqX5qCwkCAlop81a4i/yhGKNiNRMqT59h 2YwM99kHLr3iAT0lZG/yHiIRZRK7+noc52PjbiPhQ9gPK4uLuEt88E+8puClrko57KbJ qrXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id df17si962455edb.3.2021.03.17.07.53.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:18 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaJ032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:17 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 10/11] ci_build: Migrate to Avocado Date: Wed, 17 Mar 2021 17:52:24 +0300 Message-Id: <20210317145225.88050-11-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491265515699625?= X-GMAIL-MSGID: =?utf-8?q?1694491265515699625?= Call Avocado test cases instead of shell based. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 170 ++++---------------------- scripts/ci_build_legacy.sh | 239 +++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+), 148 deletions(-) create mode 100755 scripts/ci_build_legacy.sh diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 3868fb6..9abebb8 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -14,59 +14,12 @@ export PATH=$PATH:/sbin # Go to Isar root cd "$(dirname "$0")/.." +# Get Avocado build tests path +BUILD_TEST_DIR="$(pwd)/testsuite/build_test" + # Start build in Isar tree by default BUILD_DIR=./build -BB_ARGS="-v" - -TARGETS_SET="\ - mc:qemuarm-stretch:isar-image-base \ - mc:qemuarm-buster:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base \ - mc:qemui386-stretch:isar-image-base \ - mc:qemui386-buster:isar-image-base \ - mc:qemuamd64-stretch:isar-image-base \ - mc:qemuamd64-buster:isar-image-base \ - mc:qemuamd64-buster-tgz:isar-image-base \ - mc:qemuamd64-buster:isar-initramfs \ - mc:qemumipsel-stretch:isar-image-base \ - mc:qemumipsel-buster:isar-image-base \ - mc:nand-ubi-demo-buster:isar-image-ubi \ - mc:rpi-stretch:isar-image-base \ - mc:qemuamd64-focal:isar-image-base" - # qemu-user-static of <= buster too old to build that - # mc:qemuarm64-buster:isar-image-base - # mc:qemuarm64-bullseye:isar-image-base - -TARGETS_SET_BULLSEYE="\ - mc:qemuamd64-bullseye:isar-image-base \ - mc:qemuarm-bullseye:isar-image-base \ - mc:qemui386-bullseye:isar-image-base \ - mc:qemumipsel-bullseye:isar-image-base \ -" - -CROSS_TARGETS_SET="\ - mc:qemuarm-stretch:isar-image-base \ - mc:qemuarm-buster:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base \ - mc:qemuamd64-stretch:isar-image-base \ - mc:de0-nano-soc-buster:isar-image-base \ - mc:stm32mp15x-buster:isar-image-base \ - mc:rpi-stretch:isar-image-base \ - mc:qemuarm64-focal:isar-image-base" - -CROSS_TARGETS_SET_BULLSEYE="\ - mc:qemuarm-bullseye:isar-image-base \ -" - -REPRO_TARGETS_SET_SIGNED="\ - mc:de0-nano-soc-buster:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base" - -REPRO_TARGETS_SET="\ - mc:qemuamd64-stretch:isar-image-base \ - mc:qemuarm-buster:isar-image-base" - show_help() { echo "This script builds the default Isar images." echo @@ -88,6 +41,10 @@ show_help() { echo " 3 if invalid parameters are passed." } +TAGS="full" +CROSS_BUILD="0" +QUIET="0" + # Parse command line to get user configuration while [ $# -gt 0 ] do @@ -106,16 +63,18 @@ do CROSS_BUILD="1" ;; -d|--debug) - BB_ARGS="$BB_ARGS -D" + QUIET="0" + VERBOSE="--show-job-log" ;; -f|--fast) # Start build for the reduced set of configurations # Enforce cross-compilation to speed up the build - FAST_BUILD="1" + TAGS="fast" CROSS_BUILD="1" ;; -q|--quiet) - BB_ARGS="" + QUIET="1" + VERBOSE="" ;; -r|--repro) REPRO_BUILD="1" @@ -134,106 +93,21 @@ do shift done +if [ -z "$REPRO_BUILD" ]; then + TAGS = "$TAGS,-repro" +fi + +# Provide working path +export VIRTUAL_ENV="./" + # the real stuff starts here, trace commands from now on set -x # Setup build folder for the current build if [ ! -d "$BUILD_DIR" ]; then - mkdir -p "$BUILD_DIR" + mkdir -p "$BUILD_DIR" fi source isar-init-build-env "$BUILD_DIR" -cat >>conf/local.conf <> conf/local.conf - bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED - while [ -e bitbake.sock ]; do sleep 1; done - sudo rm -rf tmp - sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf - bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED - while [ -e bitbake.sock ]; do sleep 1; done - # Cleanup and disable use of signed cached base repository - sudo rm -rf tmp - sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf - sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf - - # Enable use of unsigned cached base repository - bitbake $BB_ARGS $REPRO_TARGETS_SET - while [ -e bitbake.sock ]; do sleep 1; done - sudo rm -rf tmp - sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf - bitbake $BB_ARGS $REPRO_TARGETS_SET - while [ -e bitbake.sock ]; do sleep 1; done - # Cleanup and disable use of unsigned cached base repository - sudo rm -rf tmp - sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf -fi - -sed -i -e 's/^#BASE_REPO_FEATURES ?= "cache-deb-src"/BASE_REPO_FEATURES ?= "cache-deb-src"/g' conf/local.conf -# Start cross build for the defined set of configurations -sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf -bitbake $BB_ARGS $CROSS_TARGETS_SET -while [ -e bitbake.sock ]; do sleep 1; done -if bitbake $BB_ARGS $CROSS_TARGETS_SET_BULLSEYE; then - echo "bullseye cross: PASSED" -else - echo "bullseye cross: KFAIL" -fi -# In addition test SDK creation -bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base -while [ -e bitbake.sock ]; do sleep 1; done - -if [ -z "$FAST_BUILD" ]; then - # Cleanup and disable cross build - sudo rm -rf tmp - sed -i -e 's/ISAR_CROSS_COMPILE ?= "1"/ISAR_CROSS_COMPILE ?= "0"/g' conf/local.conf - bitbake $BB_ARGS $TARGETS_SET - while [ -e bitbake.sock ]; do sleep 1; done - - if bitbake $BB_ARGS $TARGETS_SET_BULLSEYE; then - echo "bullseye: PASSED" - else - echo "bullseye: KFAIL" - fi - while [ -e bitbake.sock ]; do sleep 1; done -fi - -eval $(bitbake -e | grep "^LAYERDIR_core=") -eval $(bitbake -e | grep "^LAYERDIR_isar=") -cp -a "${LAYERDIR_core}/classes/dpkg-base.bbclass" "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" -echo -e "do_fetch_append() {\n\n}" >> "${LAYERDIR_core}/classes/dpkg-base.bbclass" - -bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base - -mv "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" "${LAYERDIR_core}/classes/dpkg-base.bbclass" - -# Test wic --exclude-path -cp -a "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" -mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img \ - ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup -sed -i -e 's/part \/ /part \/ --exclude-path usr /g' "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" - -bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base - -mv "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" -mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup \ - ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img +avocado run "$BUILD_TEST_DIR/build_test.py" -t $TAGS -p build_dir="$BUILD_DIR" \ + -p quiet=$QUIET -p cross=$CROSS_BUILD $VERBOSE diff --git a/scripts/ci_build_legacy.sh b/scripts/ci_build_legacy.sh new file mode 100755 index 0000000..3868fb6 --- /dev/null +++ b/scripts/ci_build_legacy.sh @@ -0,0 +1,239 @@ +#!/usr/bin/env bash +# Script for CI system build +# +# Alexander Smirnov +# Copyright (c) 2016-2018 ilbers GmbH + +set -e + +ES_BUG=3 + +# Export $PATH to use 'parted' tool +export PATH=$PATH:/sbin + +# Go to Isar root +cd "$(dirname "$0")/.." + +# Start build in Isar tree by default +BUILD_DIR=./build + +BB_ARGS="-v" + +TARGETS_SET="\ + mc:qemuarm-stretch:isar-image-base \ + mc:qemuarm-buster:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base \ + mc:qemui386-stretch:isar-image-base \ + mc:qemui386-buster:isar-image-base \ + mc:qemuamd64-stretch:isar-image-base \ + mc:qemuamd64-buster:isar-image-base \ + mc:qemuamd64-buster-tgz:isar-image-base \ + mc:qemuamd64-buster:isar-initramfs \ + mc:qemumipsel-stretch:isar-image-base \ + mc:qemumipsel-buster:isar-image-base \ + mc:nand-ubi-demo-buster:isar-image-ubi \ + mc:rpi-stretch:isar-image-base \ + mc:qemuamd64-focal:isar-image-base" + # qemu-user-static of <= buster too old to build that + # mc:qemuarm64-buster:isar-image-base + # mc:qemuarm64-bullseye:isar-image-base + +TARGETS_SET_BULLSEYE="\ + mc:qemuamd64-bullseye:isar-image-base \ + mc:qemuarm-bullseye:isar-image-base \ + mc:qemui386-bullseye:isar-image-base \ + mc:qemumipsel-bullseye:isar-image-base \ +" + +CROSS_TARGETS_SET="\ + mc:qemuarm-stretch:isar-image-base \ + mc:qemuarm-buster:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base \ + mc:qemuamd64-stretch:isar-image-base \ + mc:de0-nano-soc-buster:isar-image-base \ + mc:stm32mp15x-buster:isar-image-base \ + mc:rpi-stretch:isar-image-base \ + mc:qemuarm64-focal:isar-image-base" + +CROSS_TARGETS_SET_BULLSEYE="\ + mc:qemuarm-bullseye:isar-image-base \ +" + +REPRO_TARGETS_SET_SIGNED="\ + mc:de0-nano-soc-buster:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base" + +REPRO_TARGETS_SET="\ + mc:qemuamd64-stretch:isar-image-base \ + mc:qemuarm-buster:isar-image-base" + +show_help() { + echo "This script builds the default Isar images." + echo + echo "Usage:" + echo " $0 [params]" + echo + echo "Parameters:" + echo " -b, --build BUILD_DIR set path to build directory. If not set," + echo " the build will be started in current path." + echo " -c, --cross enable cross-compilation." + echo " -d, --debug enable debug bitbake output." + echo " -f, --fast cross build reduced set of configurations." + echo " -q, --quiet suppress verbose bitbake output." + echo " -r, --repro enable use of cached base repository." + echo " --help display this message and exit." + echo + echo "Exit status:" + echo " 0 if OK," + echo " 3 if invalid parameters are passed." +} + +# Parse command line to get user configuration +while [ $# -gt 0 ] +do + key="$1" + + case $key in + -h|--help) + show_help + exit 0 + ;; + -b|--build) + BUILD_DIR="$2" + shift + ;; + -c|--cross) + CROSS_BUILD="1" + ;; + -d|--debug) + BB_ARGS="$BB_ARGS -D" + ;; + -f|--fast) + # Start build for the reduced set of configurations + # Enforce cross-compilation to speed up the build + FAST_BUILD="1" + CROSS_BUILD="1" + ;; + -q|--quiet) + BB_ARGS="" + ;; + -r|--repro) + REPRO_BUILD="1" + # This switch is deprecated, just here to not cause failing CI on + # legacy configs + case "$2" in + -s|--sign) shift ;; + esac + ;; + *) + echo "error: invalid parameter '$key', please try '--help' to get list of supported parameters" + exit $ES_BUG + ;; + esac + + shift +done + +# the real stuff starts here, trace commands from now on +set -x + +# Setup build folder for the current build +if [ ! -d "$BUILD_DIR" ]; then + mkdir -p "$BUILD_DIR" +fi +source isar-init-build-env "$BUILD_DIR" + +cat >>conf/local.conf <> conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED + while [ -e bitbake.sock ]; do sleep 1; done + sudo rm -rf tmp + sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED + while [ -e bitbake.sock ]; do sleep 1; done + # Cleanup and disable use of signed cached base repository + sudo rm -rf tmp + sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf + sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf + + # Enable use of unsigned cached base repository + bitbake $BB_ARGS $REPRO_TARGETS_SET + while [ -e bitbake.sock ]; do sleep 1; done + sudo rm -rf tmp + sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET + while [ -e bitbake.sock ]; do sleep 1; done + # Cleanup and disable use of unsigned cached base repository + sudo rm -rf tmp + sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf +fi + +sed -i -e 's/^#BASE_REPO_FEATURES ?= "cache-deb-src"/BASE_REPO_FEATURES ?= "cache-deb-src"/g' conf/local.conf +# Start cross build for the defined set of configurations +sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf +bitbake $BB_ARGS $CROSS_TARGETS_SET +while [ -e bitbake.sock ]; do sleep 1; done +if bitbake $BB_ARGS $CROSS_TARGETS_SET_BULLSEYE; then + echo "bullseye cross: PASSED" +else + echo "bullseye cross: KFAIL" +fi +# In addition test SDK creation +bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base +while [ -e bitbake.sock ]; do sleep 1; done + +if [ -z "$FAST_BUILD" ]; then + # Cleanup and disable cross build + sudo rm -rf tmp + sed -i -e 's/ISAR_CROSS_COMPILE ?= "1"/ISAR_CROSS_COMPILE ?= "0"/g' conf/local.conf + bitbake $BB_ARGS $TARGETS_SET + while [ -e bitbake.sock ]; do sleep 1; done + + if bitbake $BB_ARGS $TARGETS_SET_BULLSEYE; then + echo "bullseye: PASSED" + else + echo "bullseye: KFAIL" + fi + while [ -e bitbake.sock ]; do sleep 1; done +fi + +eval $(bitbake -e | grep "^LAYERDIR_core=") +eval $(bitbake -e | grep "^LAYERDIR_isar=") +cp -a "${LAYERDIR_core}/classes/dpkg-base.bbclass" "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" +echo -e "do_fetch_append() {\n\n}" >> "${LAYERDIR_core}/classes/dpkg-base.bbclass" + +bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base + +mv "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" "${LAYERDIR_core}/classes/dpkg-base.bbclass" + +# Test wic --exclude-path +cp -a "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" +mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img \ + ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup +sed -i -e 's/part \/ /part \/ --exclude-path usr /g' "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" + +bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base + +mv "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" +mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup \ + ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img From patchwork Wed Mar 17 04:52:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 373 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:378f:0:0:0:0:0 with SMTP id r137csp645932oor; Wed, 17 Mar 2021 07:53:22 -0700 (PDT) X-Received: by 2002:a5d:68cd:: with SMTP id p13mr5008258wrw.247.1615992802231; Wed, 17 Mar 2021 07:53:22 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1615992802; cv=pass; d=google.com; s=arc-20160816; b=Rfchkkk/qBaxORMpQyRyuVP3yKoPiSMyD/ECbKzz0UlGHbYRJCHs1HjAZwYxzY/+6E ayp9v5j/eBa8UX4+6w/m9XbNc8sQ++H9JL1Z62iTXJZx8bqJjZlucHa2KP9bBvS1TK++ 3IyS9YitmpK/kIKNClrxqu+Md0JJ03PDQBlq70FXqjAi5/TlV6LygRqZuqmRIbMN2G6G ikrZZlrDAso4xbkE6mpn8V7GIVTZXrchF9m3yZEE+y8Dz8rjvPd6QrGFoTBoAO+qxCIY x4MrvTxgC9EBFl8wUNl6V3mxqhZNJ8lfaXAK2fP1mdgRf0FMxUfzib45wIKX0fjPJziB c8QA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=cyC2vBnqSegL6VOezng+TuxFh+EweVDuz/EWwODmO7w=; b=JRZsebCoLMkvZzrYr1ahBa9t8q8jc9onsK0gaiK0o3Ftkb5fdFwLt5NuOF0mOia9Lu gQN/oP0KJsOutTW+C8N3roiXUqlNaZQjcDJ9J2RrfB5JxZOIYZwDODDK2XpSZ9pMk5YD hBDU5Qa3EJcPvWcJDTzpkcPwzcpc0L+CRZxBNRSQ6XjLqfxA0wiNkE++GXn9kihEA8pM 9OSX8MBo/TM8k2biXv0LFI1vOYU3aoI9Xew+imHajghSssYlQ1j7Kkd2l74yfrRr/7DU ponNfu2W83pOngC61K7oPzdk1LencUVf23VsXvtrb6gy1MrBYeNBVTOuDts1+8ciUWRo /iKg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=nFg3kdG5; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbynpzcbamgqeg46porq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBYNPZCBAMGQEG46PORQ@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id v11sor10741032wrw.36.2021.03.17.07.53.22 (Google Transport Security); Wed, 17 Mar 2021 07:53:22 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbchiponzwecrbynpzcbamgqeg46porq@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=nFg3kdG5; arc=pass (i=2 spf=pass spfdomain=ilbers.de); spf=pass (google.com: domain of isar-users+bncbchiponzwecrbynpzcbamgqeg46porq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCHIPONZWECRBYNPZCBAMGQEG46PORQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1615992802; cv=pass; d=google.com; s=arc-20160816; b=LWCfWo5JtCR3jMEeGm55y8nTn+VOVtd1XZN54+0yTxMf3h+kuBmoH3XjvdeyXPoqvX 0K/+SeaD+/Mggk2kAfMCY9wartc1wioqBcsUuWKoNIIXIGblfrtte5HuXJtw6bIDlcg7 s2TOMpjH8dzUI+l19aFQHBKgRgwOj9/hVfsdDp6a7aJZE+8k63xX3MD95i2Qvt5eAYNs 2t64twjwZSeeGCl939vAKtpZ50v4Eh8jAUB4pqO999vVb4EY7HL7uhCxC/vXRT7EHXz7 JYXBeOotjEZ4/iE/QIAF9pKWY38A3ZDcKSeU9LhVzLS/c/kBeuLu1Vhtl33x6zZZT9HW XkTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=cyC2vBnqSegL6VOezng+TuxFh+EweVDuz/EWwODmO7w=; b=cLWN7ds+rMgUQ2buJ5oYFUDIshVb3PMR5ilKAGahwfieEA9EdIH9pEKRPr5LbUt+RU VNf5SesyzYDcD3L2hVuBGBHwncqIl+PDbIVveTR1ShXWzR5ydkIdCdRUCFPP4+iwbrGZ FhYaVmKN/hRj41vWemiPMXoza7CvYPXEXFBznV+ZKmcvjrqVWyG9IfNXNDVQlC4rZxRp V9kx90S8hqkJoI3k1c7lumffs8utPydizojMGG0hJRgMNOpPe+ld3DbURtpiwcq3CMOC 7hPPCXSBpeBeIHg0lcCtI7xD6rJ3FKvbqTFguX5H2Ct6h3neStpJmU87GTbqFPfMFNNY mJPA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cyC2vBnqSegL6VOezng+TuxFh+EweVDuz/EWwODmO7w=; b=nFg3kdG5a1M7HXHhedtyu6H+g5oPlS/QXcXlA0FYpzGqcWPAVpLuxJipAPby3qo6rD 6FmywLK4XciBvJvs4yDi09XDV/pIS63I3l06Zq9WhdRi6BzD5cCiA0NaMEkm6WTB4tQh dCGMArbo9mh2gow02v9KA+/xC1WUc4rfcyUxFuzGRaR1jNxwvWF27GmxkqE+70CjOMPd DAeC6nITi+jKJ8n0KR0rAUlQef3l3/lEVnPIqE9ft426pbF8Sqj6cWwqBo8JxU6sCvNn j+5htmJFg4BKaYeLPhIPJAGpju3lbaDfs1R1DuyDXD7YKsoQcErabnmQlG4FOzRPRZnd 6ASw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=cyC2vBnqSegL6VOezng+TuxFh+EweVDuz/EWwODmO7w=; b=X6NJfqnv4psUwOPBZpy0n7Ze+MDCzZjBMEg0TC0EyBKeLalfaQn8OLekbhJzJLuACa U6pzyoFAgtqz/q7ktZPg0CyqaHQJ4ktW5ibafrFXTn6U12IT4y5w055XaYh4Bkg88/JL 3WA5bjFzGTx1h6l7jIBlsvVAvB0SoxaRzFcnN44S3n2NeI4KipP9jVqHN6NDivJK5LUl fRnjol5vGgUOYejTg2ga6I4bvgjC0XVX6ZpJdTTR7Dw2LjLWe5TDQ0TTSynchfO1SvIP Edq/YVfsOOOguqIgi+KSaJZMTlUGCpYL/oYj/Ffjr5BkTIairznTTVQ7Mui86niAfMN+ eMPg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530w9k2ZF7wQ6H/dyA1+EzY+fZb2F55mRgG5kTsDfsX48QrOgp7E w848tCgT7WIbJ0jwLT3J2x4= X-Google-Smtp-Source: ABdhPJyghiDV34kiE8tvoGKGdALqU7kWjTjvB0+8CKZmjfbDFgaYEXDXa6a2tAU1sYfyAYPeG3legg== X-Received: by 2002:adf:ec46:: with SMTP id w6mr4764340wrn.213.1615992802010; Wed, 17 Mar 2021 07:53:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1546:: with SMTP id f6ls1504306wmg.3.canary-gmail; Wed, 17 Mar 2021 07:53:21 -0700 (PDT) X-Received: by 2002:a1c:7715:: with SMTP id t21mr4043576wmi.132.1615992801249; Wed, 17 Mar 2021 07:53:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992801; cv=none; d=google.com; s=arc-20160816; b=vJ0r1jjLdqH96QsXmP8KVnrdGz5OAWZlYZLEDoqy4Geo1x5MTgpeVm7BVVpoo3qxJz ZVPHAv+sQ60tQsCucON/vCy710uaQKKqQxKZBpPuQneEooaYZKIHFWWyOkjXK6Mrys2k PUGZpMm2IQv/D7M6ot67RCrTM2do7B7xjrw8BDRghBHvNeuqMZvKMTUqNAlEV8NuU8zV TZedI026sjyJAhRSBBxjfjZSUSGlgRFq6VMNduwvl7SaTVa7nr5zHsyocqujwFBtXmA0 9YGD9gg2a4HvWZ+hEriHtqU0C1fMWso2Z1wbNj0phdjPMRJBVT7fnTtOgVvetbk+OSHw HgcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=jB9L046epci06pgtsa6cilBK5YeaDnceeaSWjoXAJcg=; b=SvX8sg9D1K+4v69+UlL9x5zat1yxFwjgloDwwinfVNSBHmolUd1aHByD8iHXjHOFKj u2eQFh6gs/rBy1h7M0KY+pB9v3GbF5I0ct9ruIUkz59uUKw/zkxuRlmk0VCDAahW3+ig xNseRalHUrRzupFG7D9l2KMGrEOcRHHAgEZSZWXYaX5FyC366u+RtUi2C+zrplh/f+qw G2wRLXURXJU1cbAfcqhaQ+guvhkugLl9kduxpEvc9aHPxLT6XHlNVb89K5J/eZ58NSBW 1KYKUOuXpK76hNCow8p9vxpsZhkD+0N31QeZR1bi5F6IsYMqLn2jd/FrEhUK02A7Zy8S 56zg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id w2si59195wmb.4.2021.03.17.07.53.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:21 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaK032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:20 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 11/11] vm_smoke_test: Migrate to Avocado Date: Wed, 17 Mar 2021 17:52:25 +0300 Message-Id: <20210317145225.88050-12-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1694491268178303092?= X-GMAIL-MSGID: =?utf-8?q?1694491268178303092?= Call Avocado test cases instead of shell based. Signed-off-by: Anton Mikanovich --- scripts/vm_smoke_test | 110 ++++------------------- scripts/vm_smoke_test_legacy | 168 +++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 93 deletions(-) create mode 100755 scripts/vm_smoke_test_legacy diff --git a/scripts/vm_smoke_test b/scripts/vm_smoke_test index ce08213..0ef3caf 100755 --- a/scripts/vm_smoke_test +++ b/scripts/vm_smoke_test @@ -3,9 +3,7 @@ # This software is a part of ISAR. # Copyright (C) 2015-2018 ilbers GmbH -CONSOLE_OUTPUT=/tmp/isar_console -PID_FILE=/tmp/qemu.pid -VERBOSE=1 +VERBOSE="--show-job-log" TIMEOUT=300 # Error codes: @@ -13,75 +11,12 @@ ES_OK=0 ES_FAIL=1 ES_BUG=3 -RET=$ES_OK +RET=$ES_FAIL -dump_boot_log() { - echo "Boot log:\n8<--" - cat $CONSOLE_OUTPUT - echo "\n8<--" -} - -check_login_prompt() { - echo -n "Check login prompt: " - - str=$(grep "isar login: " $CONSOLE_OUTPUT) - - if [ -n "$str" ]; then - echo "PASSED" - else - echo "FAIL" - RET=$ES_FAIL - FAIL=1 - fi -} - -check_example_module() { - echo -n "Check example module: " - - str=$(grep "Just an example" $CONSOLE_OUTPUT) - - if [ -n "$str" ]; then - echo "PASSED" - else - echo "FAIL" - RET=$ES_FAIL - FAIL=1 - fi -} - -run_test () { - ARCH=$1 - DISTRO=$2 - - echo "-------------------------------------------------" - echo "Testing Isar [$DISTRO] image for [$ARCH] machine:" +# Get Avocado QEMU tests path +VM_TEST_DIR="$(dirname "$0")/../testsuite/vm_boot_test" - start_vm -a $ARCH -d $DISTRO -o $CONSOLE_OUTPUT -p $PID_FILE > /dev/null 2>&1 & - sleep 5 - - if [ -z `ps -p $! -o pid=` ]; then - echo "QEMU start: FAILED" - RET=$ES_FAIL - echo "Command output:\n8<--" - start_vm -a $ARCH -d $DISTRO -o $CONSOLE_OUTPUT -p $PID_FILE - echo "\n8<--" - else - sleep $TIMEOUT - kill `cat $PID_FILE` - - FAIL=0 - - check_login_prompt - - check_example_module - - [ $VERBOSE -eq 1 -o $FAIL -eq 1 ] && dump_boot_log - - rm $CONSOLE_OUTPUT - fi - - rm $PID_FILE -} +BUILD_DIR=$PWD show_help() { echo "This script tests the Isar images for default targets in QEMU." @@ -91,10 +26,6 @@ show_help() { echo echo "Parameters:" echo " -f,--fast test reduced set of supported targets." - echo " -o,--output FILE specify file to store console output." - echo " The default is: /tmp/isar_console" - echo " -p,--pid-file FILE specify file to store QEMU process PID." - echo " The default is: /tmp/qemu.pid" echo " -q, --quiet do not display boot logs for all the targets." echo " If test failed for the specific configuration," echo " the respective boot log will be printed anyway." @@ -119,18 +50,18 @@ do exit 0 ;; -o|--output) - CONSOLE_OUTPUT=$2 + # Deprecated option shift ;; -p|--pid-file) - PID_FILE=$2 + # Deprecated option shift ;; -f|--fast) FAST_BUILD="1" ;; -q|--quiet) - VERBOSE=0 + VERBOSE="" ;; -t|--timeout) TIMEOUT=$2 @@ -145,24 +76,17 @@ do shift done -# ARM machine -run_test arm stretch -run_test arm buster - -# AMD64 machine -if [ -z "$FAST_BUILD" ]; then - run_test amd64 buster - run_test amd64 focal +TAGS="full" +if [ -n "$FAST_BUILD" ]; then + TAGS="fast" fi -run_test amd64 stretch -# i386 machine -if [ -z "$FAST_BUILD" ]; then - run_test i386 stretch - run_test i386 buster -fi +# Provide working path +export VIRTUAL_ENV="./" -# ARM64 machine -run_test arm64 stretch +if avocado run "$VM_TEST_DIR/vm_boot_test.py" -t $TAGS \ + -p build_dir="$BUILD_DIR" -p time_to_wait=$TIMEOUT $VERBOSE; then + RET=$ES_OK +fi exit $RET diff --git a/scripts/vm_smoke_test_legacy b/scripts/vm_smoke_test_legacy new file mode 100755 index 0000000..ce08213 --- /dev/null +++ b/scripts/vm_smoke_test_legacy @@ -0,0 +1,168 @@ +#!/bin/sh +# +# This software is a part of ISAR. +# Copyright (C) 2015-2018 ilbers GmbH + +CONSOLE_OUTPUT=/tmp/isar_console +PID_FILE=/tmp/qemu.pid +VERBOSE=1 +TIMEOUT=300 + +# Error codes: +ES_OK=0 +ES_FAIL=1 +ES_BUG=3 + +RET=$ES_OK + +dump_boot_log() { + echo "Boot log:\n8<--" + cat $CONSOLE_OUTPUT + echo "\n8<--" +} + +check_login_prompt() { + echo -n "Check login prompt: " + + str=$(grep "isar login: " $CONSOLE_OUTPUT) + + if [ -n "$str" ]; then + echo "PASSED" + else + echo "FAIL" + RET=$ES_FAIL + FAIL=1 + fi +} + +check_example_module() { + echo -n "Check example module: " + + str=$(grep "Just an example" $CONSOLE_OUTPUT) + + if [ -n "$str" ]; then + echo "PASSED" + else + echo "FAIL" + RET=$ES_FAIL + FAIL=1 + fi +} + +run_test () { + ARCH=$1 + DISTRO=$2 + + echo "-------------------------------------------------" + echo "Testing Isar [$DISTRO] image for [$ARCH] machine:" + + start_vm -a $ARCH -d $DISTRO -o $CONSOLE_OUTPUT -p $PID_FILE > /dev/null 2>&1 & + sleep 5 + + if [ -z `ps -p $! -o pid=` ]; then + echo "QEMU start: FAILED" + RET=$ES_FAIL + echo "Command output:\n8<--" + start_vm -a $ARCH -d $DISTRO -o $CONSOLE_OUTPUT -p $PID_FILE + echo "\n8<--" + else + sleep $TIMEOUT + kill `cat $PID_FILE` + + FAIL=0 + + check_login_prompt + + check_example_module + + [ $VERBOSE -eq 1 -o $FAIL -eq 1 ] && dump_boot_log + + rm $CONSOLE_OUTPUT + fi + + rm $PID_FILE +} + +show_help() { + echo "This script tests the Isar images for default targets in QEMU." + echo + echo "Usage:" + echo " $0 [params]" + echo + echo "Parameters:" + echo " -f,--fast test reduced set of supported targets." + echo " -o,--output FILE specify file to store console output." + echo " The default is: /tmp/isar_console" + echo " -p,--pid-file FILE specify file to store QEMU process PID." + echo " The default is: /tmp/qemu.pid" + echo " -q, --quiet do not display boot logs for all the targets." + echo " If test failed for the specific configuration," + echo " the respective boot log will be printed anyway." + echo " -t,--timeout SEC specify time in seconds to wait before stop QEMU." + echo " The default is: 300" + echo " -h, --help display this message and exit." + echo + echo "Exit status:" + echo " 0 if OK," + echo " 1 if test failed," + echo " 3 if invalid parameters are passed." +} + +# Parse command line to get user configuration +while [ $# -gt 0 ] +do + key="$1" + + case $key in + -h|--help) + show_help + exit 0 + ;; + -o|--output) + CONSOLE_OUTPUT=$2 + shift + ;; + -p|--pid-file) + PID_FILE=$2 + shift + ;; + -f|--fast) + FAST_BUILD="1" + ;; + -q|--quiet) + VERBOSE=0 + ;; + -t|--timeout) + TIMEOUT=$2 + shift + ;; + *) + echo "error: invalid parameter '$key', please try '--help' to get list of supported parameters" + exit $ES_BUG + ;; + esac + + shift +done + +# ARM machine +run_test arm stretch +run_test arm buster + +# AMD64 machine +if [ -z "$FAST_BUILD" ]; then + run_test amd64 buster + run_test amd64 focal +fi +run_test amd64 stretch + +# i386 machine +if [ -z "$FAST_BUILD" ]; then + run_test i386 stretch + run_test i386 buster +fi + +# ARM64 machine +run_test arm64 stretch + +exit $RET