From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6990633379674718208 X-Received: by 2002:a5d:6908:: with SMTP id t8mr1709776wru.421.1627633682392; Fri, 30 Jul 2021 01:28:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:54c9:: with SMTP id x9ls1203583wrv.1.gmail; Fri, 30 Jul 2021 01:28:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytQIwN5MP2oE9XkafzL6n7QHxxmIAgf3FtVSbkEma/rDPNl6jcfygweoSV1H6KuMGxKQ8D X-Received: by 2002:a05:6000:7:: with SMTP id h7mr1715909wrx.298.1627633681658; Fri, 30 Jul 2021 01:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627633681; cv=none; d=google.com; s=arc-20160816; b=yC0TfypAHY4OYtyFaToEY2OA0C+klmq5mYG5ngdTNqgtEA4cBmms9Y8Gzbazu1aEUf t2PoDbSmKdHDfNing1EienUVAldf3qptETdmCQcX89cAUbGj7Hf7HDmR/iMaB+nZEH8X si6nShQCBZUWnfzXxuCgFGVOurdjdCN7Rn06pOdPOwr/zTaeBrN0U+v+6ziMtUE0UkkF 9piDUT0Q2Mfe73g+IymkMuvm9oJ/xMxZIxxqlJJP5RaiPbEvJ5ocLqeSKWCuc55qdS+w AFo7Xl4rAm3iKZBiyj8S0zepjYCntwLodpncmSZpcTSPQ0gtplvONXhORBOKi/iKsv0Y kfRQ== 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=p7jVP2kTeUcm8ann5gix4oacVThL5E+OA756ROR4u/g21locYt+xuZFdJkuqOx79a5 P0mCXlOFCJbJFdBawdLcj/UlsOtCwzgTb9V0dGi25RQZQwRHa7kk0X0UkaeoRQf0pi8t HiV5r1PjyzQfFkXSSFpMl9SD99Sh0KpToX9Dgwiu13KFQpnPDeYFSXoIg+e5Y85L28ym u75DA8xN84Gmhnkh//oQYjsU6SDDcpyH2pUdE3M7CPXjefhrbzbA2iZEKLAIkCvmPuxB ZMEBzJTISjw5wI9poXQQa7oIH6htVdiKUbwimyaqf+5xvUDziZmGkqt88DhKOKIL5jj7 6dpA== 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 x5si51088wrl.1.2021.07.30.01.28.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 01:28:01 -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-88-30-214-37.mgts.dynamic.pppoe.byfly.by [37.214.30.88] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16U8RkvV008721 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Jul 2021 10:28:00 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v10 13/17] vm_boot_test: Add automatic bitbake init Date: Fri, 30 Jul 2021 11:27:35 +0300 Message-Id: <20210730082739.15042-14-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210730082739.15042-1-amikan@ilbers.de> References: <20210730082739.15042-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-TUID: DpEuhrkO4rIg 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