From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327959769307676672 X-Received: by 2002:a2e:8543:0:b0:2cf:155e:2567 with SMTP id u3-20020a2e8543000000b002cf155e2567mr495699ljj.95.1706173590213; Thu, 25 Jan 2024 01:06:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7c02:0:b0:2cf:2c34:2fa6 with SMTP id x2-20020a2e7c02000000b002cf2c342fa6ls468622ljc.0.-pod-prod-05-eu; Thu, 25 Jan 2024 01:06:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQntYetnvXEK/jKdwPDw8hR3EekYrjXltXWI27lZONR7Gsm5dmS4l4StYiEucc04TFKxgs X-Received: by 2002:a2e:b8d1:0:b0:2cf:131e:41ec with SMTP id s17-20020a2eb8d1000000b002cf131e41ecmr563369ljp.43.1706173588167; Thu, 25 Jan 2024 01:06:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706173588; cv=none; d=google.com; s=arc-20160816; b=Tn4JMfoUz7yizIBdw03tKNhfMq2jPWjw+N/hl+ccUFlwqcZ//VP52Q0Ij4pyi+kXUG 2w8BfJfAvR/cFYObr3dOl+P5g4OS1Jbu8dBSp9bwxEFS0ZQzxig/hytBFGBM/7V0kOsG auvKnPbXSjvkCFcDjcWywN/twXGilBtxqzCO5lFHonCMANlxECEs5GPqE7N4ySqdEkeG viua1CVjpYa63OoTq+PzYKUiLfndpftXfHikyt4W365MGA1mn4O2orXdZ7KUpbj9k9pw PSYodQuAor+Si+gzEhnLexjvoNGjkVVX8+YuFedGGsGOSLmI/Yc/alnAopG0i9o0mtRB DUtA== 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=YrVnRibbjPVqdGHECzaP4/9jFBxPt6nTgkd296AIz0Y=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=WDUJmihMT9WOJ4+c8JfCwPDZzqFPsCQJX0tK7NcyJkQs/1ehs/L7N5fmV0o30SyqDg bTbQjs+OLMC9yV0iV9dHZ9EBfTcMAspWhn1MuNTYIe/DgWwlbM6u8J4qfBg3nZZLqGyY opbPeL6Ob/ZPsFH4t0sUtYizEy4x45GRNYi6HgFUsVYUABY5eaBXtpE34A7EpcdSZooO 3Bh/ZZH1SG920NRN50tHJtTa3PnWerwjUGqjtgF16mnSIdtH4uNJJUItGL83Fc/cnKYk TNTUm6kIc7GjXOprDCV11xEJo+AMEgGDzgNYizefrNqL9xfzXeEFMlAGPUd5eq/6ZBSz 96Hw== 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 v6-20020a2e9f46000000b002cf1105e060si54748ljk.8.2024.01.25.01.06.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 01:06:28 -0800 (PST) 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 user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 40P96PqT010870 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jan 2024 10:06:27 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/4] CI: Fix getVars API self checks Date: Thu, 25 Jan 2024 11:06:14 +0200 Message-Id: <20240125090617.2945621-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125090617.2945621-1-amikan@ilbers.de> References: <20240125090617.2945621-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: 7NxBDjsgH7Nn Fix bitbake lock filename and add init calling check to make getVars API more stable. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index bb62bb8d..a5b57a3c 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -254,6 +254,7 @@ class CIBuilder(Test): return env['LAYERDIR_' + layer].strip('"') def getVars(self, *vars, target=None): + self.check_init() def fixStream(stream): # fix stream objects to emulate _io.TextIOWrapper stream.isatty = lambda: False @@ -264,7 +265,8 @@ class CIBuilder(Test): fixStream(sys.stdout) fixStream(sys.stderr) - lockfile = os.path.join(self.build_dir, 'bitbake.lock2') + # wait until previous bitbake will be finished + lockfile = os.path.join(self.build_dir, 'bitbake.lock') checks = 0 while os.path.exists(lockfile) and checks < 5: time.sleep(1) @@ -276,11 +278,11 @@ class CIBuilder(Test): tinfoil.prepare(quiet=2) d = tinfoil.parse_recipe(target) for var in vars: - values = values + (d.getVar(var),) + values = values + (d.getVar(var, True) or 'None',) else: tinfoil.prepare(config_only=True, quiet=2) for var in vars: - values = values + (tinfoil.config_data.getVar(var),) + values = values + (tinfoil.config_data.getVar(var, True) or 'None',) return values if len(values) > 1 else values[0] def create_tmp_layer(self): -- 2.34.1