From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a05:6512:2349:: with SMTP id p9mr3291862lfu.558.1631781226190; Thu, 16 Sep 2021 01:33:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls1876209lfi.2.gmail; Thu, 16 Sep 2021 01:33:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZJCJNxy8CFWN/z7D6RyEK/JwuVicmc0u3u9N74oa74QUMEerUk+geuOOlm6dHTMfzdMN3 X-Received: by 2002:a05:6512:2090:: with SMTP id t16mr742380lfr.119.1631781225338; Thu, 16 Sep 2021 01:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631781225; cv=none; d=google.com; s=arc-20160816; b=ut0HFItw9Wl6CHAJVVUGNyYo5AvAHc3Zb4knEOndpYpCnlSLbHA1Xr0rnQxG6u90iX 2HqJfXQH739sw3ssD2lGZL6Kn1WKhLJDc7XDIAuxOKwnJDhgQkRo5AS+kov7FMMBDiVj IqBh5Du+W63JY6UgD9eUVGwz+0OqnlTfY7AX78qUfkn3yNBc4Q99k0Bs0mV/x/SyxxFr vB23wldneA/ZHan2b8BejK+ldTGd9Y/yY4OKrhH2PL3ppNfKXSSF/vlQTmbSFHrQrTZb BVHMgx3uhP0+2CCjv+SwkmStCnGx8/A+zLpTC3nvzgcqBJsPp8ozHE2S5VoBCpIlslZU +62g== 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=hkupKdrmtQ9IWeVgZXe6dqG1TTNAk849zcrBjqEKw8M=; b=PIxDh9AFVOFilQfJjWCdYzNk9Ky6IlzN9gfto1Qg6vtKsIuW/QILFU2UPqBrSCLSLi /nurzmFB378srnOp8DsjKF3j3Ic8NVgE3b2KPS0KNd4JUbumVSyDYa1nwvOeo3f6BwAD cq7yXAPpU+kUH2JnvuC5tVdDD/dIwFNo/yteefuGXU6PhXH/HzaLPhFqYxKsepJE5Oq3 eFIyJY+HUpF2YOeKjYHhPrg2aGHAc2BxhtY3F1hM8m6PcRTGQVLR5b95QhfZmM6j5UL4 5Y/yVYGiwtGts1DFSwwWsNEnIQvankP+AbE59K93ENaqsrNldPTnLrQC5A3X/nzOAyh/ L+iQ== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f16si471897ljj.3.2021.09.16.01.33.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Sep 2021 01:33:45 -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; 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 Received: from localhost.localdomain (mm-240-58-214-37.mgts.dynamic.pppoe.byfly.by [37.214.58.240] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18G8X2xQ021529 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Sep 2021 10:33:42 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v11 13/16] vm_boot_test: Add automatic bitbake init Date: Thu, 16 Sep 2021 11:32:50 +0300 Message-Id: <20210916083253.53037-14-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916083253.53037-1-amikan@ilbers.de> References: <20210916083253.53037-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 2iPD6qAHqx1B Implement source of isar-init-build-env in case there is no bitbake command found. Signed-off-by: Anton Mikanovich --- testsuite/vm_boot_test/vm_boot_test.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/testsuite/vm_boot_test/vm_boot_test.py b/testsuite/vm_boot_test/vm_boot_test.py index 6e580d0..01623c5 100644 --- a/testsuite/vm_boot_test/vm_boot_test.py +++ b/testsuite/vm_boot_test/vm_boot_test.py @@ -13,12 +13,25 @@ sys.path.append(dirname(__file__) + '/..') import start_vm from avocado import Test +from avocado.utils import process +from avocado.utils import path class CanBeFinished(Exception): pass class VmBase(Test): + def check_bitbake(self, build_dir): + try: + path.find_command('bitbake') + except path.CmdNotFoundError: + out = process.getoutput('/bin/bash -c "cd ../.. && \ + source isar-init-build-env \ + %s 2>&1 >/dev/null; env"' % build_dir) + env = dict(((x.split('=', 1) + [''])[:2] \ + for x in output.splitlines() if x != '')) + os.environ.update(env) + def vm_start(self, arch='amd64', distro='buster'): build_dir = self.params.get('build_dir', default='.') time_to_wait = self.params.get('time_to_wait', default=60) @@ -28,6 +41,8 @@ class VmBase(Test): self.log.info('Isar build folder is: ' + build_dir) self.log.info('===================================================') + self.check_bitbake(build_dir) + fd, output_file = tempfile.mkstemp(suffix='_log.txt', prefix='vm_start_' + distro + '_' + arch + '_', dir=build_dir, text=True) -- 2.25.1